Merge "Remove register_globals and magic_quotes_* checks"

diff --combined includes/installer/Installer.php
index 0e8633d,0ef2d47..4a006ac
--- 1/includes/installer/Installer.php
--- 2/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@@ -116,9 -116,7 +116,7 @@@ abstract class Installer 
         */
        protected $envChecks = array(
                'envCheckDB',
-               'envCheckRegisterGlobals',
                'envCheckBrokenXML',
-               'envCheckMagicQuotes',
                'envCheckMbstring',
                'envCheckSafeMode',
                'envCheckXML',
@@@ -736,20 -734,6 +734,6 @@@
                return true;
        }
  
-       /**
-        * Environment check for register_globals.
-        * Prevent installation if enabled
-        * @return bool
-        */
-       protected function envCheckRegisterGlobals() {
-               if ( wfIniGetBool( 'register_globals' ) ) {
-                       $this->showMessage( 'config-register-globals-error' );
-                       return false;
-               }
- 
-               return true;
-       }
- 
        /**
         * Some versions of libxml+PHP break < and > encoding horribly
         * @return bool
@@@ -765,22 -749,6 +749,6 @@@
                return true;
        }
  
-       /**
-        * Environment check for magic_quotes_(gpc|runtime|sybase).
-        * @return bool
-        */
-       protected function envCheckMagicQuotes() {
-               $status = true;
-               foreach ( array( 'gpc', 'runtime', 'sybase' ) as $magicJunk ) {
-                       if ( wfIniGetBool( "magic_quotes_$magicJunk" ) ) {
-                               $this->showError( "config-magic-quotes-$magicJunk" );
-                               $status = false;
-                       }
-               }
- 
-               return $status;
-       }
- 
        /**
         * Environment check for mbstring.func_overload.
         * @return bool
@@@ -1785,15 -1753,6 +1753,15 @@@
  
                // Some of the environment checks make shell requests, remove limits
                $GLOBALS['wgMaxShellMemory'] = 0;
 +
 +              $GLOBALS['wgSessionProviders'] = array(
 +                      array(
 +                              'class' => 'InstallerSessionProvider',
 +                              'args' => array( array(
 +                                      'priority' => 1,
 +                              ) )
 +                      )
 +              );
        }
  
        /**