http://www.mediawiki.org/wiki/Special:Code/MediaWiki/93521

Revision: 93521
Author:   maxsem
Date:     2011-07-30 10:17:15 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
MFT r93520 to 1.18: Installer checked for magic_quotes_runtime instead of 
register_globals

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

Property Changed:
----------------
    branches/REL1_18/phase3/


Property changes on: branches/REL1_18/phase3
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:92634,92762,92791,92854,92958,93141,93303
   + /branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:92634,92762,92791,92854,92958,93141,93303,93520

Modified: branches/REL1_18/phase3/RELEASE-NOTES-1.18
===================================================================
--- branches/REL1_18/phase3/RELEASE-NOTES-1.18  2011-07-30 09:52:10 UTC (rev 
93520)
+++ branches/REL1_18/phase3/RELEASE-NOTES-1.18  2011-07-30 10:17:15 UTC (rev 
93521)
@@ -420,6 +420,7 @@
 * (bug 28762) Resizing to specified height broken for very thin images
 * (bug 29959) Installer fatal when cURL and allow_url_fopen is disabled and 
user
   tries to subsribe to mediawiki-announce
+* Installer checked for magic_quotes_runtime instead of register_globals.
 
 === API changes in 1.18 ===
 * BREAKING CHANGE: action=watch now requires POST and token.

Modified: branches/REL1_18/phase3/includes/installer/Installer.php
===================================================================
--- branches/REL1_18/phase3/includes/installer/Installer.php    2011-07-30 
09:52:10 UTC (rev 93520)
+++ branches/REL1_18/phase3/includes/installer/Installer.php    2011-07-30 
10:17:15 UTC (rev 93521)
@@ -652,7 +652,7 @@
         * Environment check for register_globals.
         */
        protected function envCheckRegisterGlobals() {
-               if( wfIniGetBool( "magic_quotes_runtime" ) ) {
+               if( wfIniGetBool( 'register_globals' ) ) {
                        $this->showMessage( 'config-register-globals' );
                }
        }


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to