diff options
| author | Sam Reed <reedy@users.mediawiki.org> | 2011-11-18 00:42:24 +0000 |
|---|---|---|
| committer | Sam Reed <reedy@users.mediawiki.org> | 2011-11-18 00:42:24 +0000 |
| commit | 02cf4f704f93902a59ff1d89041b00d4c97f9194 (patch) | |
| tree | 9d4b79cb060cd63a1b31d390b26220373a9817f6 | |
| parent | 29dff95d1ba334706a0847ea51d1b431bae26241 (diff) | |
Fix installer bug setting wgScriptPath to ""1.18.0rc1
Copy showMessage and the return true out of trunk
Notes
http://mediawiki.org/wiki/Special:Code/MediaWiki/103542
| -rw-r--r-- | includes/installer/Installer.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index abbcecbffa09..8101f7d6b55e 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -856,9 +856,8 @@ abstract class Installer { $IP = dirname( dirname( dirname( __FILE__ ) ) ); $this->setVar( 'IP', $IP ); - - $uri = preg_replace( '{^(.*)/(mw-)?config.*$}', '$1', $path ); - $this->setVar( 'wgScriptPath', $uri ); + $this->showMessage( 'config-using-uri', $this->getVar( 'wgServer' ), $this->getVar( 'wgScriptPath' ) ); + return true; } /** |