jenkins-bot has submitted this change and it was merged.
Change subject: Consistently use require_once for MWVersion.php
......................................................................
Consistently use require_once for MWVersion.php
Most files used it already, but some used 'require' or 'include' instead.
Also strip redundant parentheses per our coding conventions.
'require' and 'include' are operators, not functions.
Change-Id: If799694471be2b2e1b6d6303d7cf870820003284
---
M extract2.php
M mobilelanding.php
M w/api.php
M w/auth-api.php
M w/favicon.php
M w/thumb_handler.php
M w/touch.php
7 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Jforrester: Looks good to me, but someone else must approve
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extract2.php b/extract2.php
index e0f2407..b1fac44 100644
--- a/extract2.php
+++ b/extract2.php
@@ -2,7 +2,7 @@
$lang = 'meta';
putenv( "MW_LANG={$lang}" ); // notify MWMultiVersion
-require '/srv/mediawiki/w/MWVersion.php';
+require_once '/srv/mediawiki/w/MWVersion.php';
require getMediaWiki( 'includes/WebStart.php' );
$allowed_templates = array(
diff --git a/mobilelanding.php b/mobilelanding.php
index f2ca3bc..40376e4 100644
--- a/mobilelanding.php
+++ b/mobilelanding.php
@@ -1,8 +1,8 @@
<?php
putenv( 'MW_LANG=en' ); // notify MWMultiVersion
-include '/srv/mediawiki/w/MWVersion.php';
-include getMediaWiki( 'includes/WebStart.php' );
+require_once '/srv/mediawiki/w/MWVersion.php';
+require getMediaWiki( 'includes/WebStart.php' );
$code = '302';
$state = ZeroBanner\PageRenderingHooks::getState();
diff --git a/w/api.php b/w/api.php
index a4ee46b..cd9c315 100644
--- a/w/api.php
+++ b/w/api.php
@@ -1,3 +1,3 @@
<?php
-require_once( './MWVersion.php' );
+require_once './MWVersion.php';
require getMediaWiki( 'api.php' );
diff --git a/w/auth-api.php b/w/auth-api.php
index 1c361f3..ae1d690 100644
--- a/w/auth-api.php
+++ b/w/auth-api.php
@@ -1,3 +1,3 @@
<?php
-require_once( './MWVersion.php' );
+require_once './MWVersion.php';
require getMediaWiki( 'extensions/SecurePoll/auth-api.php' );
diff --git a/w/favicon.php b/w/favicon.php
index 7334a30..1d0a99e 100644
--- a/w/favicon.php
+++ b/w/favicon.php
@@ -1,5 +1,5 @@
<?php
-require '/srv/mediawiki/w/MWVersion.php';
+require_once '/srv/mediawiki/w/MWVersion.php';
require getMediaWiki( 'includes/WebStart.php' );
function faviconShowError( $text ) {
diff --git a/w/thumb_handler.php b/w/thumb_handler.php
index d6acf6f..802a69a 100644
--- a/w/thumb_handler.php
+++ b/w/thumb_handler.php
@@ -1,3 +1,3 @@
<?php
-require_once( './MWVersion.php' );
+require_once './MWVersion.php';
require getMediaWiki( 'thumb_handler.php' );
diff --git a/w/touch.php b/w/touch.php
index ed83788..3570254 100644
--- a/w/touch.php
+++ b/w/touch.php
@@ -1,5 +1,5 @@
<?php
-require '/srv/mediawiki/w/MWVersion.php';
+require_once '/srv/mediawiki/w/MWVersion.php';
require getMediaWiki( 'includes/WebStart.php' );
function faviconShowError( $text ) {
--
To view, visit https://gerrit.wikimedia.org/r/263415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If799694471be2b2e1b6d6303d7cf870820003284
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: 20after4 <mmod...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
