summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-08-02 17:10:25 +0200
committerLukas Reschke <lukas@statuscode.ch>2017-08-02 23:08:45 +0200
commit585e5c6ea5057f3de5d798405a3ed1add673e91b (patch)
treeb704bdd316534a47c7a6fe25e4e039ed30a647de
parentc40352c03071740f51544f0fcd7fc787c5c3f27b (diff)
downloadnextcloud-server-585e5c6ea5057f3de5d798405a3ed1add673e91b.tar.gz
nextcloud-server-585e5c6ea5057f3de5d798405a3ed1add673e91b.zip
Logo claim is not used anymore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
-rw-r--r--apps/files_sharing/templates/public.php1
-rw-r--r--core/templates/layout.guest.php1
-rw-r--r--lib/private/Template/JSConfigHelper.php2
-rw-r--r--lib/private/legacy/defaults.php9
-rw-r--r--lib/public/Defaults.php3
-rw-r--r--themes/example/defaults.php1
6 files changed, 6 insertions, 11 deletions
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 2514fa3f921..a593e596dfb 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -47,7 +47,6 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
</span>
</div>
- <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
<div class="header-right">
<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) {
if ($_['server2serversharing']) {
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index d97da109842..9a4f9c37198 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -33,7 +33,6 @@
<img src="<?php p($theme->getLogo()); ?>"/>
<?php endif; ?>
</div>
- <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
</div>
</header>
<?php endif; ?>
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 '';
}
/**
diff --git a/lib/public/Defaults.php b/lib/public/Defaults.php
index 543657694c5..4bf638fda9f 100644
--- a/lib/public/Defaults.php
+++ b/lib/public/Defaults.php
@@ -143,9 +143,10 @@ class Defaults {
* logo claim
* @return string
* @since 6.0.0
+ * @deprecated 13.0.0
*/
public function getLogoClaim() {
- return $this->defaults->getLogoClaim();
+ return '';
}
/**
diff --git a/themes/example/defaults.php b/themes/example/defaults.php
index 27d0cccaf60..186cda236b1 100644
--- a/themes/example/defaults.php
+++ b/themes/example/defaults.php
@@ -111,6 +111,7 @@ class OC_Theme {
/**
* Returns logo claim
* @return string logo claim
+ * @deprecated 13.0.0 not used anymore
*/
public function getLogoClaim() {
return '';