http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70390
Revision: 70390
Author: tparscal
Date: 2010-08-03 17:33:09 +0000 (Tue, 03 Aug 2010)
Log Message:
-----------
Moved server location out of ResourceLoader and into load.php. Now whatever
might want to respond to a resource loader request can do so without
ResourceLoader knowing anything about load.php.
Modified Paths:
--------------
branches/resourceloader/phase3/includes/ResourceLoader.php
branches/resourceloader/phase3/load.php
Modified: branches/resourceloader/phase3/includes/ResourceLoader.php
===================================================================
--- branches/resourceloader/phase3/includes/ResourceLoader.php 2010-08-03
17:18:15 UTC (rev 70389)
+++ branches/resourceloader/phase3/includes/ResourceLoader.php 2010-08-03
17:33:09 UTC (rev 70390)
@@ -183,7 +183,7 @@
* 'debug' => [boolean: true to include debug-only
scripts, optional, false by default],
* )
*/
- public static function respond( WebRequest $request ) {
+ public static function respond( WebRequest $request, $server ) {
global $wgUser, $wgLang, $wgDefaultSkin;
// Fallback on system settings
$parameters = array(
@@ -234,7 +234,7 @@
*
* Also, the naming of these variables is horrible and
sad, hopefully this can be worked on
*/
- $parameters['server'] = dirname(
$_SERVER['REQUEST_URI'] );
+ $parameters['server'] = $server;
echo "mw.config.set( " . json_encode( $parameters ) . "
);\n";
// Collect all loaders
$loaders = array();
Modified: branches/resourceloader/phase3/load.php
===================================================================
--- branches/resourceloader/phase3/load.php 2010-08-03 17:18:15 UTC (rev
70389)
+++ branches/resourceloader/phase3/load.php 2010-08-03 17:33:09 UTC (rev
70390)
@@ -50,7 +50,7 @@
// Include core resource list
require_once "$IP/resources/Resources.php";
// Respond to resource loading request
-ResourceLoader::respond( $wgRequest );
+ResourceLoader::respond( $wgRequest, $wgServer . $wgScriptPath . '/load.php' );
wfProfileOut( 'load.php' );
wfLogProfilingData();
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
