diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-08-03 08:20:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-03 08:20:56 +0200 |
| commit | 8fecc336ac78719777c1a11ee62c14f084b56d51 (patch) | |
| tree | 9f45e47c5b47ce6a941b068d8e194b63ab6e154d /lib/private | |
| parent | 21dd85678f2a1d613fc5cd1e1901785808747051 (diff) | |
| parent | 585e5c6ea5057f3de5d798405a3ed1add673e91b (diff) | |
| download | nextcloud-server-8fecc336ac78719777c1a11ee62c14f084b56d51.tar.gz nextcloud-server-8fecc336ac78719777c1a11ee62c14f084b56d51.zip | |
Merge pull request #5959 from nextcloud/drop-logo-claim
Logo claim is not used anymore
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Template/JSConfigHelper.php | 2 | ||||
| -rw-r--r-- | lib/private/legacy/defaults.php | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index 9a11e84f8d9..fb9b27f0765 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -238,7 +238,7 @@ class JSConfigHelper { 'docBaseUrl' => $this->defaults->getDocBaseUrl(), 'docPlaceholderUrl' => $this->defaults->buildDocLinkToKey('PLACEHOLDER'), 'slogan' => $this->defaults->getSlogan(), - 'logoClaim' => $this->defaults->getLogoClaim(), + 'logoClaim' => '', 'shortFooter' => $this->defaults->getShortFooter(), 'longFooter' => $this->defaults->getLongFooter(), 'folder' => \OC_Util::getTheme(), diff --git a/lib/private/legacy/defaults.php b/lib/private/legacy/defaults.php index f6d72d9776d..adfbe71377d 100644 --- a/lib/private/legacy/defaults.php +++ b/lib/private/legacy/defaults.php @@ -45,7 +45,6 @@ class OC_Defaults { private $defaultDocBaseUrl; private $defaultDocVersion; private $defaultSlogan; - private $defaultLogoClaim; private $defaultColorPrimary; public function __construct() { @@ -62,7 +61,6 @@ class OC_Defaults { $this->defaultDocBaseUrl = 'https://docs.nextcloud.com'; $this->defaultDocVersion = '12'; // used to generate doc links $this->defaultSlogan = $this->l->t('a safe home for all your data'); - $this->defaultLogoClaim = ''; $this->defaultColorPrimary = '#0082c9'; $themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php'; @@ -222,13 +220,10 @@ class OC_Defaults { /** * Returns logo claim * @return string logo claim + * @deprecated 13.0.0 */ public function getLogoClaim() { - if ($this->themeExist('getLogoClaim')) { - return $this->theme->getLogoClaim(); - } else { - return $this->defaultLogoClaim; - } + return ''; } /** |