MediaWiki 1.17.1-scripts

[autoinstalls/mediawiki.git] / includes / installer / Installer.php

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 993aeab4cd078fdcb664886f0a350f209ff7b6ac..e58ed32ecf6c48fc0553e436309dc6078be165ac 100644 (file)
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -643,7 +643,7 @@ abstract class Installer {
         * Environment check for register_globals.
         */
        protected function envCheckRegisterGlobals() {
-               if( wfIniGetBool( "magic_quotes_runtime" ) ) {
+               if( wfIniGetBool( 'register_globals' ) ) {
                        $this->showMessage( 'config-register-globals' );
                }
        }
@@ -782,6 +782,9 @@ abstract class Installer {
                $caches = array();
                foreach ( $this->objectCaches as $name => $function ) {
                        if ( function_exists( $function ) ) {
+                               if ( $name == 'xcache' && !wfIniGetBool( 'xcache.var_size' ) ) {
+                                       continue;
+                               }
                                $caches[$name] = true;
                        }
                }
@@ -1422,10 +1425,14 @@ abstract class Installer {
                        $params['language'] = $myLang;
                }
 
-               $res = MWHttpRequest::factory( $this->mediaWikiAnnounceUrl,
-                       array( 'method' => 'POST', 'postData' => $params ) )->execute();
-               if( !$res->isOK() ) {
-                       $s->warning( 'config-install-subscribe-fail', $res->getMessage() );
+               if( MWHttpRequest::canMakeRequests() ) {
+                       $res = MWHttpRequest::factory( $this->mediaWikiAnnounceUrl,
+                               array( 'method' => 'POST', 'postData' => $params ) )->execute();
+                       if( !$res->isOK() ) {
+                               $s->warning( 'config-install-subscribe-fail', $res->getMessage() );
+                       }
+               } else {
+                       $s->warning( 'config-install-subscribe-notpossible' );
                }
        }