Chad has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332665 )
Change subject: Swap most remaining entry points to using MWMultiVersion
......................................................................
Swap most remaining entry points to using MWMultiVersion
Omitting mobilelanding for right now, it had weird errors last time
and I want to do it by itself
Also requires additional cleanups in puppet & possibly elsewhere
Change-Id: I91374c814cfce4e03d32607aa73097ceddd901f2
---
M w/api.php
M w/auth-api.php
M w/extract2.php
M w/favicon.php
M w/img_auth.php
M w/index.php
M w/load.php
M w/opensearch_desc.php
M w/robots.php
M w/static.php
M w/thumb.php
M w/thumb_handler.php
M w/touch.php
13 files changed, 26 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/65/332665/1
diff --git a/w/api.php b/w/api.php
index 8802cc8..78ed40b 100644
--- a/w/api.php
+++ b/w/api.php
@@ -1,3 +1,3 @@
<?php
-require_once __DIR__ . '/../multiversion/MWVersion.php';
-require getMediaWiki( 'api.php' );
+require_once __DIR__ . '/../multiversion/MWMultiVersion.php';
+require MWMultiVersion::getMediaWiki( 'api.php' );
diff --git a/w/auth-api.php b/w/auth-api.php
index 03114ba..2e53f19 100644
--- a/w/auth-api.php
+++ b/w/auth-api.php
@@ -1,3 +1,3 @@
<?php
-require_once __DIR__ . '/../multiversion/MWVersion.php';
-require getMediaWiki( 'extensions/SecurePoll/auth-api.php' );
+require_once __DIR__ . '/../multiversion/MWMultiVersion.php';
+require MWMultiVersion::getMediaWiki( 'extensions/SecurePoll/auth-api.php' );
diff --git a/w/extract2.php b/w/extract2.php
index d4448ba..c9895c5 100644
--- a/w/extract2.php
+++ b/w/extract2.php
@@ -2,8 +2,8 @@
$lang = 'meta';
putenv( "MW_LANG={$lang}" ); // notify MWMultiVersion
-require_once __DIR__ . '/../multiversion/MWVersion.php';
-require getMediaWiki( 'includes/WebStart.php' );
+require_once __DIR__ . '/../multiversion/MWMultiVersion.php';
+require MWMultiVersion::getMediaWiki( 'includes/WebStart.php' );
$allowed_templates = array(
'Www.wikimedia.org_template',
diff --git a/w/favicon.php b/w/favicon.php
index 29ce43e..3e90996 100644
--- a/w/favicon.php
+++ b/w/favicon.php
@@ -1,6 +1,6 @@
<?php
-require_once __DIR__ . '/../multiversion/MWVersion.php';
-require getMediaWiki( 'includes/WebStart.php' );
+require_once __DIR__ . '/../multiversion/MWMultiVersion.php';
+require MWMultiVersion::getMediaWiki( 'includes/WebStart.php' );
function faviconShowError( $text ) {
header( 'Content-Type: text/html; charset=utf-8' );
diff --git a/w/img_auth.php b/w/img_auth.php
index 0c2a848..fbabd1a 100644
--- a/w/img_auth.php
+++ b/w/img_auth.php
@@ -1,3 +1,3 @@
<?php
-require_once __DIR__ . '/../multiversion/MWVersion.php';
-require getMediaWiki( 'img_auth.php' );
+require_once __DIR__ . '/../multiversion/MWMultiVersion.php';
+require MWMultiVersion::getMediaWiki( 'img_auth.php' );
diff --git a/w/index.php b/w/index.php
index ec3d0d3..04ac45d 100644
--- a/w/index.php
+++ b/w/index.php
@@ -1,3 +1,3 @@
<?php
-require_once __DIR__ . '/../multiversion/MWVersion.php';
-require getMediaWiki( 'index.php' );
+require_once __DIR__ . '/../multiversion/MWMultiVersion.php';
+require MWMultiVersion::getMediaWiki( 'index.php' );
diff --git a/w/load.php b/w/load.php
index 5d0c594..8f8c03c 100644
--- a/w/load.php
+++ b/w/load.php
@@ -1,3 +1,3 @@
<?php
-require_once __DIR__ . '/../multiversion/MWVersion.php';
-require getMediaWiki( 'load.php' );
+require_once __DIR__ . '/../multiversion/MWMultiVersion.php';
+require MWMultiVersion::getMediaWiki( 'load.php' );
diff --git a/w/opensearch_desc.php b/w/opensearch_desc.php
index 57b4789..eb6a191 100644
--- a/w/opensearch_desc.php
+++ b/w/opensearch_desc.php
@@ -1,3 +1,3 @@
<?php
-require_once __DIR__ . '/../multiversion/MWVersion.php';
-require getMediaWiki( 'opensearch_desc.php' );
+require_once __DIR__ . '/../multiversion/MWMultiVersion.php';
+require MWMultiVersion::getMediaWiki( 'opensearch_desc.php' );
diff --git a/w/robots.php b/w/robots.php
index 5cf4ab9..127efc2 100644
--- a/w/robots.php
+++ b/w/robots.php
@@ -1,6 +1,6 @@
<?php
-require_once __DIR__ . '/../multiversion/MWVersion.php';
-require getMediaWiki( 'includes/WebStart.php' );
+require_once __DIR__ . '/../multiversion/MWMultiVersion.php';
+require MWMultiVersion::getMediaWiki( 'includes/WebStart.php' );
$wgTitle = Title::newFromText( 'Mediawiki:robots.txt' );
$page = WikiPage::factory( $wgTitle );
diff --git a/w/static.php b/w/static.php
index 30cd50d..c729c1a 100644
--- a/w/static.php
+++ b/w/static.php
@@ -31,8 +31,8 @@
* - wmfstatic.mismatch
*/
define( 'MW_NO_SESSION', 'warn' );
-require_once __DIR__ . '/../multiversion/MWVersion.php';
-require getMediaWiki( 'includes/WebStart.php' );
+require_once __DIR__ . '/../multiversion/MWMultiVersion.php';
+require MWMultiVersion::getMediaWiki( 'includes/WebStart.php' );
function wmfStaticShowError( $message, $status, $smaxage = 60 ) {
HttpStatus::header( $status );
diff --git a/w/thumb.php b/w/thumb.php
index d10d668..e44ef58 100644
--- a/w/thumb.php
+++ b/w/thumb.php
@@ -1,3 +1,3 @@
<?php
-require_once __DIR__ . '/../multiversion/MWVersion.php';
-require getMediaWiki( 'thumb.php' );
+require_once __DIR__ . '/../multiversion/MWMultiVersion.php';
+require MWMultiVersion::getMediaWiki( 'thumb.php' );
diff --git a/w/thumb_handler.php b/w/thumb_handler.php
index a80876f..ee0b6f9 100644
--- a/w/thumb_handler.php
+++ b/w/thumb_handler.php
@@ -1,3 +1,3 @@
<?php
-require_once __DIR__ . '/../multiversion/MWVersion.php';
-require getMediaWiki( 'thumb_handler.php' );
+require_once __DIR__ . '/../multiversion/MWMultiVersion.php';
+require MWMultiVersion::getMediaWiki( 'thumb_handler.php' );
diff --git a/w/touch.php b/w/touch.php
index 322889c..561f540 100644
--- a/w/touch.php
+++ b/w/touch.php
@@ -1,6 +1,6 @@
<?php
-require_once __DIR__ . '/../multiversion/MWVersion.php';
-require getMediaWiki( 'includes/WebStart.php' );
+require_once __DIR__ . '/../multiversion/MWMultiVersion.php';
+require MWMultiVersion::getMediaWiki( 'includes/WebStart.php' );
function faviconShowError( $text ) {
header( 'Content-Type: text/html; charset=utf-8' );
--
To view, visit https://gerrit.wikimedia.org/r/332665
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91374c814cfce4e03d32607aa73097ceddd901f2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad <ch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
