https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103542

Revision: 103542
Author:   reedy
Date:     2011-11-18 00:42:24 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
Fix installer bug setting wgScriptPath to ""

Copy showMessage and the return true out of trunk

Modified Paths:
--------------
    branches/REL1_18/phase3/includes/installer/Installer.php

Modified: branches/REL1_18/phase3/includes/installer/Installer.php
===================================================================
--- branches/REL1_18/phase3/includes/installer/Installer.php    2011-11-18 
00:42:14 UTC (rev 103541)
+++ branches/REL1_18/phase3/includes/installer/Installer.php    2011-11-18 
00:42:24 UTC (rev 103542)
@@ -856,9 +856,8 @@
                $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;
        }
 
        /**


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to