BryanDavis has uploaded a new change for review.

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

Change subject: beta: Fix unset $lang from MWMultiVersion::setSiteInfoForWiki()
......................................................................

beta: Fix unset $lang from MWMultiVersion::setSiteInfoForWiki()

Fix "Notice: Undefined variable: lang in
/srv/mediawiki/multiversion/MWMultiVersion.php on line 187" by adding
a case for the special beta.wmflabs.org vhost and aborting if the
hostname doesn't match any known pattern.

Change-Id: Ic52df0066a2d02fb34b0a48f01658f8396ce109b
---
M multiversion/MWMultiVersion.php
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 501c0cb..f9a4621 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -167,6 +167,10 @@
                        } elseif ( preg_match( 
'/^([a-z0-9]*)\.beta\.wmflabs\.org$/', $serverName, $matches ) ) {
                                // http://wikidata.beta.wmflabs.org/
                                $lang = $matches[1];
+                       } elseif ( $serverName === 'beta.wmflabs.org' ) {
+                               $lang = 'deployment';
+                       } else {
+                               self::error( "Invalid host name 
($serverName).\n" );
                        }
                } elseif ( preg_match( '/^(.*)\.([a-z]+)\.org$/', $serverName, 
$matches ) ) {
                        $lang = $matches[1];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic52df0066a2d02fb34b0a48f01658f8396ce109b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to