| Index: branches/resourceloader/phase3/includes/ResourceLoader.php |
| — | — | @@ -183,7 +183,7 @@ |
| 184 | 184 | * 'debug' => [boolean: true to include debug-only scripts, optional, false by default], |
| 185 | 185 | * ) |
| 186 | 186 | */ |
| 187 | | - public static function respond( WebRequest $request ) { |
| | 187 | + public static function respond( WebRequest $request, $server ) { |
| 188 | 188 | global $wgUser, $wgLang, $wgDefaultSkin; |
| 189 | 189 | // Fallback on system settings |
| 190 | 190 | $parameters = array( |
| — | — | @@ -234,7 +234,7 @@ |
| 235 | 235 | * |
| 236 | 236 | * Also, the naming of these variables is horrible and sad, hopefully this can be worked on |
| 237 | 237 | */ |
| 238 | | - $parameters['server'] = dirname( $_SERVER['REQUEST_URI'] ); |
| | 238 | + $parameters['server'] = $server; |
| 239 | 239 | echo "mw.config.set( " . json_encode( $parameters ) . " );\n"; |
| 240 | 240 | // Collect all loaders |
| 241 | 241 | $loaders = array(); |
| Index: branches/resourceloader/phase3/load.php |
| — | — | @@ -50,7 +50,7 @@ |
| 51 | 51 | // Include core resource list |
| 52 | 52 | require_once "$IP/resources/Resources.php"; |
| 53 | 53 | // Respond to resource loading request |
| 54 | | -ResourceLoader::respond( $wgRequest ); |
| | 54 | +ResourceLoader::respond( $wgRequest, $wgServer . $wgScriptPath . '/load.php' ); |
| 55 | 55 | |
| 56 | 56 | wfProfileOut( 'load.php' ); |
| 57 | 57 | wfLogProfilingData(); |