Fix for bug 28235: IE6 looks for the file extension in the query string

[lhc/web/wiklou.git] / load.php

diff --git a/load.php b/load.php
index 9e18a5b..89aec98 100644 (file)
--- a/load.php
+++ b/load.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * This file is the entry point for the resource loader.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -15,16 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @author Roan Kattouw
  * @author Trevor Parscal
  *
  */
 
-/**
- * @file
- * This file is the entry point for the resource loader.
- */
- 
 require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
 wfProfileIn( 'load.php' );
 
@@ -39,18 +37,16 @@ wfProfileIn( 'load.php' );
 //
 if ( $wgRequest->isPathInfoBad() ) {
        wfHttpError( 403, 'Forbidden',
-               'Invalid file extension found in PATH_INFO. ' .
-               'The resource loader must be accessed through the primary script entry point.' );
+               'Invalid file extension found in PATH_INFO or QUERY_STRING.' );
        return;
-       // FIXME: Doesn't this execute the rest of the request anyway?
-       // Was taken from api.php so I guess it's maybe OK but it doesn't look good.
 }
 
 // Respond to resource loading request
-ResourceLoader::respond( new ResourceLoaderContext( $wgRequest, $wgServer . $wgScriptPath . '/load.php' ) );
+$resourceLoader = new ResourceLoader();
+$resourceLoader->respond( new ResourceLoaderContext( $resourceLoader, $wgRequest ) );
 
 wfProfileOut( 'load.php' );
 wfLogProfilingData();
 
 // Shut down the database
-wfGetLBFactory()->shutdown();
\ No newline at end of file
+wfGetLBFactory()->shutdown();