[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Check config variables are set before applying

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/383179 )

Change subject: Check config variables are set before applying
..


Check config variables are set before applying

Bug: T169732
Change-Id: I979210617b594da60a883371c6d7073341add81f
---
0 files changed, 0 insertions(+), 0 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I979210617b594da60a883371c6d7073341add81f
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Chad 
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]: Check config variables are set before applying

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383179 )

Change subject: Check config variables are set before applying
..

Check config variables are set before applying

Bug: T169732
Change-Id: I979210617b594da60a883371c6d7073341add81f
---
M wmf-config/CommonSettings.php
1 file changed, 11 insertions(+), 5 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0dc18ce..881bb64 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -652,11 +652,17 @@
 
 // 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'],
-];
+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

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

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

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