X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FInstaller.php;h=0294c4281eb8dfee053d18cc4b97f6270265d8b0;hb=5a4a33a8ff7241c4b4e12c169195080c1fe417ee;hp=fa41974fbb85a7e133b2c6f491c9b665ac94b774;hpb=a957836f4a8714dcdb96fa4d71f83b16dd281b90;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index fa41974fbb..0294c4281e 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -119,7 +119,6 @@ abstract class Installer {
 		'envCheckRegisterGlobals',
 		'envCheckBrokenXML',
 		'envCheckMagicQuotes',
-		'envCheckMagicSybase',
 		'envCheckMbstring',
 		'envCheckSafeMode',
 		'envCheckXML',
@@ -137,6 +136,7 @@ abstract class Installer {
 		'envCheckLibicu',
 		'envCheckSuhosinMaxValueLength',
 		'envCheckCtype',
+		'envCheckIconv',
 		'envCheckJSON',
 	);
 
@@ -761,31 +761,19 @@ abstract class Installer {
 	}
 
 	/**
-	 * Environment check for magic_quotes_runtime.
+	 * Environment check for magic_quotes_(gpc|runtime|sybase).
 	 * @return bool
 	 */
 	protected function envCheckMagicQuotes() {
-		if ( wfIniGetBool( "magic_quotes_runtime" ) ) {
-			$this->showError( 'config-magic-quotes-runtime' );
-
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Environment check for magic_quotes_sybase.
-	 * @return bool
-	 */
-	protected function envCheckMagicSybase() {
-		if ( wfIniGetBool( 'magic_quotes_sybase' ) ) {
-			$this->showError( 'config-magic-quotes-sybase' );
-
-			return false;
+		$status = true;
+		foreach ( array( 'gpc', 'runtime', 'sybase' ) as $magicJunk ) {
+			if ( wfIniGetBool( "magic_quotes_$magicJunk" ) ) {
+				$this->showError( "config-magic-quotes-$magicJunk" );
+				$status = false;
+			}
 		}
 
-		return true;
+		return $status;
 	}
 
 	/**
@@ -1207,6 +1195,19 @@ abstract class Installer {
 		return true;
 	}
 
+	/**
+	 * @return bool
+	 */
+	protected function envCheckIconv() {
+		if ( !function_exists( 'iconv' ) ) {
+			$this->showError( 'config-iconv' );
+
+			return false;
+		}
+
+		return true;
+	}
+
 	/**
 	 * @return bool
 	 */