Follow-up r82845: fix $wgScriptPath detection.
authorMax Semenik <maxsem@users.mediawiki.org>
Sat, 26 Feb 2011 12:51:35 +0000 (12:51 +0000)
committerMax Semenik <maxsem@users.mediawiki.org>
Sat, 26 Feb 2011 12:51:35 +0000 (12:51 +0000)
includes/installer/Installer.php

index af21572..013ce6c 100644 (file)
@@ -837,7 +837,7 @@ abstract class Installer {
                        return false;
                }
 
-               $uri = preg_replace( '{^(.*)/config.*$}', '$1', $path );
+               $uri = preg_replace( '{^(.*)/(mw-)?config.*$}', '$1', $path );
                $this->setVar( 'wgScriptPath', $uri );
        }