diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2011-12-03 09:20:55 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2011-12-03 09:20:55 +0100 |
commit | a22fbfc60f36f5f7ee10d5ae6fe347340c2ee67c (patch) | |
tree | 31882fdc36540fecfd62e5011fc38515e504a3db /includes/installer/Installer.php | |
parent | 6ca0c5e0a943b64b4e3d0a11a80c5679f7252e64 (diff) |
Update to MediaWiki 1.17.1
Diffstat (limited to 'includes/installer/Installer.php')
-rw-r--r-- | includes/installer/Installer.php | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index 6da4f100..9ae5e3f3 100644 --- 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; } } @@ -1441,10 +1444,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' ); } } |