nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix default product name for old themes 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2021-06-16 15:52:49 +02:00
parent 818fc95b03
commit f6108acea4
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ class ThemingDefaults extends \OC_Defaults {
$this->name = parent::getName();
$this->title = parent::getTitle();
$this->entity = parent::getEntity();
$this->productName = parent::getName();
$this->productName = parent::getProductName();
$this->url = parent::getBaseUrl();
$this->color = parent::getColorPrimary();
$this->iTunesAppId = parent::getiTunesAppId();

9
lib/private/legacy/OC_Defaults.php
View File

@ -53,6 +53,7 @@ class OC_Defaults {
private $defaultSlogan;
private $defaultColorPrimary;
private $defaultTextColorPrimary;
private $defaultProductName;
public function __construct() {
$config = \OC::$server->getConfig();
@ -69,6 +70,7 @@ class OC_Defaults {
$this->defaultDocVersion = \OC_Util::getVersion()[0]; // used to generate doc links
$this->defaultColorPrimary = '#0082c9';
$this->defaultTextColorPrimary = '#ffffff';
$this->defaultProductName = 'Nextcloud';
$themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
if (file_exists($themePath)) {
@ -331,4 +333,11 @@ class OC_Defaults {
}
return $this->defaultTextColorPrimary;
}
public function getProductName() {
if ($this->themeExist('getProductName')) {
return $this->theme->getProductName();
}
return $this->defaultProductName;
}
}