diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-10-26 12:13:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 12:13:58 +0200 |
| commit | c280eff9b5daa0cf85322b00e38662c1ff4fc7bd (patch) | |
| tree | df59fa3b1d9a89c7252a626abfdadb7abdf31dce /apps/theming | |
| parent | f9e323c1881700c8389898a8da81ac1afaf6c187 (diff) | |
| parent | e71f2220821974aaf2f2b3357c0505e13a541b5a (diff) | |
| download | nextcloud-server-c280eff9b5daa0cf85322b00e38662c1ff4fc7bd.tar.gz nextcloud-server-c280eff9b5daa0cf85322b00e38662c1ff4fc7bd.zip | |
Merge pull request #17673 from nextcloud/fix/lang/locale/jshelper/mess
Fix jsConfigHelper lang/locale mixup
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/lib/ThemingDefaults.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index ec96889fdeb..bca3d70e4ef 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -70,8 +70,6 @@ class ThemingDefaults extends \OC_Defaults { /** @var string */ private $url; /** @var string */ - private $slogan; - /** @var string */ private $color; /** @var string */ @@ -115,7 +113,6 @@ class ThemingDefaults extends \OC_Defaults { $this->title = parent::getTitle(); $this->entity = parent::getEntity(); $this->url = parent::getBaseUrl(); - $this->slogan = parent::getSlogan(); $this->color = parent::getColorPrimary(); $this->iTunesAppId = parent::getiTunesAppId(); $this->iOSClientUrl = parent::getiOSClientUrl(); @@ -143,7 +140,7 @@ class ThemingDefaults extends \OC_Defaults { } public function getSlogan() { - return \OCP\Util::sanitizeHTML($this->config->getAppValue('theming', 'slogan', $this->slogan)); + return \OCP\Util::sanitizeHTML($this->config->getAppValue('theming', 'slogan', parent::getSlogan())); } public function getImprintUrl() { |