Browse Source

Logo claim is not used anymore

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
pull/5959/head
Morris Jobke 8 years ago
committed by Lukas Reschke
parent
commit
585e5c6ea5
No known key found for this signature in database GPG Key ID: B9F6980CF6E759B1
  1. 1
      apps/files_sharing/templates/public.php
  2. 1
      core/templates/layout.guest.php
  3. 2
      lib/private/Template/JSConfigHelper.php
  4. 9
      lib/private/legacy/defaults.php
  5. 3
      lib/public/Defaults.php
  6. 1
      themes/example/defaults.php

1
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']) {

1
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; ?>

2
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(),

9
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 '';
}
/**

3
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 '';
}
/**

1
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 '';

Loading…
Cancel
Save