[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Enable new print styles on Vector"

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

Change subject: Revert "Enable new print styles on Vector"
..


Revert "Enable new print styles on Vector"

   166 Notice: Undefined index: copyright-width in 
/srv/mediawiki/wmf-config/CommonSettings.php on line 656
166 Notice: Undefined index: copyright in 
/srv/mediawiki/wmf-config/CommonSettings.php on line 658
166 Notice: Undefined index: copyright-height in 
/srv/mediawiki/wmf-config/CommonSettings.php on line 657

This reverts commit a2f4667954e844273bb2e655d5bd3e5fe10d8b75.

Change-Id: Ibaa3e8237bf1fbd7763cfda5bf9031213a4f4e4f
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 0 insertions(+), 13 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0dc18ce..c932ae9 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -650,14 +650,6 @@
wfLoadSkin( 'Timeless' ); // T154371
 }
 
-// The Print logo for Vector should use the same wordmark as Minerva
-// This avoids duplicate config entries (T169732)
-$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.
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f7a217a..46b4de6 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7176,11 +7176,6 @@
'nostalgiawiki' => 'nostalgia',
 ],
 
-// T169732
-'wgVectorExperimentalPrintStyles' => [
-   'default' => true,
-],
-
 'wgVectorResponsive' => [
'default' => false,
'testwiki' => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibaa3e8237bf1fbd7763cfda5bf9031213a4f4e4f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
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 new print styles on Vector"

2017-10-09 Thread Hashar (Code Review)
Hello Urbanecm, jenkins-bot, Jdlrobson, Zoranzoki21,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/383178

to review the following change.


Change subject: Revert "Enable new print styles on Vector"
..

Revert "Enable new print styles on Vector"

   166 Notice: Undefined index: copyright-width in 
/srv/mediawiki/wmf-config/CommonSettings.php on line 656
166 Notice: Undefined index: copyright in 
/srv/mediawiki/wmf-config/CommonSettings.php on line 658
166 Notice: Undefined index: copyright-height in 
/srv/mediawiki/wmf-config/CommonSettings.php on line 657

This reverts commit a2f4667954e844273bb2e655d5bd3e5fe10d8b75.

Change-Id: Ibaa3e8237bf1fbd7763cfda5bf9031213a4f4e4f
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 0 insertions(+), 13 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0dc18ce..c932ae9 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -650,14 +650,6 @@
wfLoadSkin( 'Timeless' ); // T154371
 }
 
-// The Print logo for Vector should use the same wordmark as Minerva
-// This avoids duplicate config entries (T169732)
-$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.
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f7a217a..46b4de6 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7176,11 +7176,6 @@
'nostalgiawiki' => 'nostalgia',
 ],
 
-// T169732
-'wgVectorExperimentalPrintStyles' => [
-   'default' => true,
-],
-
 'wgVectorResponsive' => [
'default' => false,
'testwiki' => true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibaa3e8237bf1fbd7763cfda5bf9031213a4f4e4f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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