From 585e5c6ea5057f3de5d798405a3ed1add673e91b Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 2 Aug 2017 17:10:25 +0200
Subject: [PATCH] Logo claim is not used anymore

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 apps/files_sharing/templates/public.php | 1 -
 core/templates/layout.guest.php         | 1 -
 lib/private/Template/JSConfigHelper.php | 2 +-
 lib/private/legacy/defaults.php         | 9 ++-------
 lib/public/Defaults.php                 | 3 ++-
 themes/example/defaults.php             | 1 +
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 2514fa3f92..a593e596df 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 d97da10984..9a4f9c3719 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 9a11e84f8d..fb9b27f076 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 f6d72d9776..adfbe71377 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 543657694c..4bf638fda9 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 27d0cccaf6..186cda236b 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 '';