jenkins-bot has submitted this change and it was merged.
Change subject: Make load.php parse in PHP 4 again
......................................................................
Make load.php parse in PHP 4 again
Not sure what for, but if it "needs" to parse, then let's make it parse…
Change-Id: I28ec3b3a86f6eb90e3341f967649fb4c910966d7
---
M load.php
1 file changed, 5 insertions(+), 6 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/load.php b/load.php
index fc6cf98..8b23909 100644
--- a/load.php
+++ b/load.php
@@ -38,16 +38,15 @@
return;
}
-// Respond to resource loading request
-$resourceLoader = new ResourceLoader(
- ConfigFactory::getDefaultInstance()->makeConfig( 'main' )
-);
+// Respond to resource loading request.
+// foo()->bar() syntax is not supported in PHP4, and this file needs to
*parse* in PHP4.
+$configFactory = ConfigFactory::getDefaultInstance();
+$resourceLoader = new ResourceLoader( $configFactory->makeConfig( 'main' ) );
$resourceLoader->respond( new ResourceLoaderContext( $resourceLoader,
$wgRequest ) );
wfProfileOut( 'load.php' );
wfLogProfilingData();
-// Shut down the database. foo()->bar() syntax is not supported in PHP4, and
this file
-// needs to *parse* in PHP4, although we'll never get down here to worry about
= vs =&
+// Shut down the database.
$lb = wfGetLBFactory();
$lb->shutdown();
--
To view, visit https://gerrit.wikimedia.org/r/170949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28ec3b3a86f6eb90e3341f967649fb4c910966d7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
