diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-10-25 13:31:19 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-10-25 13:31:19 +0200 |
| commit | e71f2220821974aaf2f2b3357c0505e13a541b5a (patch) | |
| tree | 6027904602224faec1042d685bef49750ac12673 /apps/theming/lib | |
| parent | 6a560fd51eee392c9cbcca91eea3f2bb6a307f0c (diff) | |
| download | nextcloud-server-e71f2220821974aaf2f2b3357c0505e13a541b5a.tar.gz nextcloud-server-e71f2220821974aaf2f2b3357c0505e13a541b5a.zip | |
Cleanup theming mess
* Do not do translations in the constructor. This gets called to early
so there is no user yet. Which means we can't obtain the locale. Which
means we store the wrong translation instance.
* Same for the theming app magic. Just use the parent call when needed.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/theming/lib')
| -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() { |