diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-09-13 13:08:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 13:08:37 +0200 |
| commit | d659199ff5eb3aeae66155c9f151ffd81c697cd3 (patch) | |
| tree | c9a4c48f00deee1b8a8de605d2fbbfc8bf0df7f4 /apps/theming | |
| parent | 241579587a6ce66a1eab52339d48d35c8051978b (diff) | |
| parent | 91598cbfb57d8493b0f5b63bce972d01a59ce1fd (diff) | |
| download | nextcloud-server-d659199ff5eb3aeae66155c9f151ffd81c697cd3.tar.gz nextcloud-server-d659199ff5eb3aeae66155c9f151ffd81c697cd3.zip | |
Merge pull request #5398 from nextcloud/theming-page-title
Fallback to "getTitle" / "getEntity" of filesystem theme in theming app
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/lib/ThemingDefaults.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index 5dd22fb6326..6ee546d2630 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -50,6 +50,10 @@ class ThemingDefaults extends \OC_Defaults { /** @var string */ private $name; /** @var string */ + private $title; + /** @var string */ + private $entity; + /** @var string */ private $url; /** @var string */ private $slogan; @@ -93,6 +97,8 @@ class ThemingDefaults extends \OC_Defaults { $this->appManager = $appManager; $this->name = parent::getName(); + $this->title = parent::getTitle(); + $this->entity = parent::getEntity(); $this->url = parent::getBaseUrl(); $this->slogan = parent::getSlogan(); $this->color = parent::getColorPrimary(); @@ -110,11 +116,11 @@ class ThemingDefaults extends \OC_Defaults { } public function getTitle() { - return $this->getName(); + return strip_tags($this->config->getAppValue('theming', 'name', $this->title)); } public function getEntity() { - return $this->getName(); + return strip_tags($this->config->getAppValue('theming', 'name', $this->entity)); } public function getBaseUrl() { |