[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Enable Vector print logo on test wiki"

2017-10-10 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/383484 )

Change subject: Revert "Enable Vector print logo on test wiki"
..


Revert "Enable Vector print logo on test wiki"

This reverts commit e8ab435a3564ebd3f4f964110b43ca1e8669de98.

Change-Id: Ia7b092e559487058b6a9b5909c4404f44dfe89a1
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 14 deletions(-)

Approvals:
  Thcipriani: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 8c7ceea..d53b1de 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -650,20 +650,6 @@
wfLoadSkin( 'Timeless' ); // T154371
 }
 
-// The Print logo for Vector should use the same wordmark as Minerva
-// This avoids duplicate config entries (T169732)
-if (
-   isset( $wgMinervaCustomLogos['copyright'] ) &&
-   isset( $wgMinervaCustomLogos['copyright-height'] ) &&
-   isset( $wgMinervaCustomLogos['copyright-width'] )
-) {
-   $wgVectorPrintLogo = [
-   'width' => $wgMinervaCustomLogos['copyright-width'],
-   'height' => $wgMinervaCustomLogos['copyright-height'],
-   'url' =>  $wgMinervaCustomLogos['copyright'],
-   ];
-}
-
 // Grants and rights
 // Note these have to be visible on all wikis, not just the ones the
 // extension is enabled on, for proper display in OAuth pages and such.

-- 
To view, visit https://gerrit.wikimedia.org/r/383484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7b092e559487058b6a9b5909c4404f44dfe89a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Enable Vector print logo on test wiki"

2017-10-10 Thread Thcipriani (Code Review)
Thcipriani has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383484 )

Change subject: Revert "Enable Vector print logo on test wiki"
..

Revert "Enable Vector print logo on test wiki"

This reverts commit e8ab435a3564ebd3f4f964110b43ca1e8669de98.

Change-Id: Ia7b092e559487058b6a9b5909c4404f44dfe89a1
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/84/383484/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 8c7ceea..d53b1de 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -650,20 +650,6 @@
wfLoadSkin( 'Timeless' ); // T154371
 }
 
-// The Print logo for Vector should use the same wordmark as Minerva
-// This avoids duplicate config entries (T169732)
-if (
-   isset( $wgMinervaCustomLogos['copyright'] ) &&
-   isset( $wgMinervaCustomLogos['copyright-height'] ) &&
-   isset( $wgMinervaCustomLogos['copyright-width'] )
-) {
-   $wgVectorPrintLogo = [
-   'width' => $wgMinervaCustomLogos['copyright-width'],
-   'height' => $wgMinervaCustomLogos['copyright-height'],
-   'url' =>  $wgMinervaCustomLogos['copyright'],
-   ];
-}
-
 // Grants and rights
 // Note these have to be visible on all wikis, not just the ones the
 // extension is enabled on, for proper display in OAuth pages and such.

-- 
To view, visit https://gerrit.wikimedia.org/r/383484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7b092e559487058b6a9b5909c4404f44dfe89a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits