Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326364 )
Change subject: installer: Restore PHP 5.3 compatibility in index.php
......................................................................
installer: Restore PHP 5.3 compatibility in index.php
This file should remain compatible with PHP 5.3, so that we can
actually display the error message about old PHP version, rather than
a syntax error.
Change-Id: If12f79f5d375e925291728aac7c9db18ca226d26
---
M mw-config/index.php
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/64/326364/1
diff --git a/mw-config/index.php b/mw-config/index.php
index 926ac43..31e29ff 100644
--- a/mw-config/index.php
+++ b/mw-config/index.php
@@ -1,4 +1,6 @@
<?php
+// @codingStandardsIgnoreFile Generic.Arrays.DisallowLongArraySyntax
+// @codingStandardsIgnoreFile MediaWiki.Usage.DirUsage.FunctionFound
/**
* New version of MediaWiki web-based config/installation
*
@@ -22,9 +24,7 @@
// Bail on old versions of PHP, or if composer has not been run yet to install
// dependencies. Using dirname( __FILE__ ) here because __DIR__ is PHP5.3+.
-// @codingStandardsIgnoreStart MediaWiki.Usage.DirUsage.FunctionFound
require_once dirname( __FILE__ ) . '/../includes/PHPVersionCheck.php';
-// @codingStandardsIgnoreEnd
wfEntryPointCheck( 'mw-config/index.php' );
define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' );
@@ -32,8 +32,8 @@
// Resolve relative to regular MediaWiki root
// instead of mw-config subdirectory.
-chdir( dirname( __DIR__ ) );
-require dirname( __DIR__ ) . '/includes/WebStart.php';
+chdir( dirname( dirname( __FILE__ ) ) );
+require dirname( dirname( __FILE__ ) ) . '/includes/WebStart.php';
wfInstallerMain();
@@ -60,7 +60,7 @@
if ( isset( $_SESSION['installData'][$fingerprint] ) ) {
$session = $_SESSION['installData'][$fingerprint];
} else {
- $session = [];
+ $session = array();
}
if ( !is_null( $wgRequest->getVal( 'uselang' ) ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/326364
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If12f79f5d375e925291728aac7c9db18ca226d26
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
