* (bug 11428) Allow $wgScript inside $wgArticlePath when emulating PATH_INFO

  Fixes 'root'-style rewrite configurations

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0df4c52..2f33b5a 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -280,6 +280,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12451) AJAX title normalization tweaks
 * When a user creating a page is not allowed to either create the page nor edit
   it, all applicable reasons are now shown.
+* (bug 11428) Allow $wgScript inside $wgArticlePath when emulating PATH_INFO
+  Fixes 'root'-style rewrite configurations
 
 
 == Parser changes in 1.12 ==

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index b549b9e..aafe13f 100644 (file)
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -70,8 +70,19 @@ class WebRequest {
                                if( $a ) {
                                        $path = $a['path'];
                                        
+                                       global $wgScript;
+                                       if( $path == $wgScript ) {
+                                               // Script inside a rewrite path?
+                                               // Abort to keep from breaking...
+                                               return;
+                                       }
+                                       // Raw PATH_INFO style
+                                       $matches = $this->extractTitle( $path, "$wgScript/$1" );
+                                       
                                        global $wgArticlePath;
-                                       $matches = $this->extractTitle( $path, $wgArticlePath );
+                                       if( !$matches && $wgActionPaths) {
+                                               $matches = $this->extractTitle( $path, $wgArticlePath );
+                                       }
                                        
                                        global $wgActionPaths;
                                        if( !$matches && $wgActionPaths) {