mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5398 from nextcloud/theming-page-title 

Fallback to "getTitle" / "getEntity" of filesystem theme in theming app
This commit is contained in:
Morris Jobke 2017-09-13 13:08:37 +02:00 committed by GitHub
parent 241579587a 91598cbfb5
commit d659199ff5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/theming/lib/ThemingDefaults.php
View File

@ -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() {