X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FInstaller.php;h=52be321f69d15feef004fb4ed01d43b0c4b5a1e6;hb=7320a9577e882fbeacb1772977fbfecf8aa5424d;hp=a29d9875a58001b5df73cf9c3d72a3e98eb74b75;hpb=d8d4ca82e96d924819ad1952af633316507853b4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index a29d9875a5..52be321f69 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -134,6 +134,7 @@ abstract class Installer {
 		'envCheckUploadsDirectory',
 		'envCheckLibicu',
 		'envCheckSuhosinMaxValueLength',
+		'envCheck64Bit',
 	];
 
 	/**
@@ -1081,6 +1082,20 @@ abstract class Installer {
 		return true;
 	}
 
+	/**
+	 * Checks if we're running on 64 bit or not. 32 bit is becoming increasingly
+	 * hard to support, so let's at least warn people.
+	 *
+	 * @return bool
+	 */
+	protected function envCheck64Bit() {
+		if ( PHP_INT_SIZE == 4 ) {
+			$this->showMessage( 'config-using-32bit' );
+		}
+
+		return true;
+	}
+
 	/**
 	 * Convert a hex string representing a Unicode code point to that code point.
 	 * @param string $c
@@ -1353,7 +1368,7 @@ abstract class Installer {
 		}
 
 		// extensions -> extension.json, skins -> skin.json
-		$jsonFile = substr( $directory, 0, strlen( $directory ) -1 ) . '.json';
+		$jsonFile = substr( $directory, 0, strlen( $directory ) - 1 ) . '.json';
 
 		$dh = opendir( $extDir );
 		$exts = [];
@@ -1374,7 +1389,7 @@ abstract class Installer {
 			}
 		}
 		closedir( $dh );
-		natcasesort( $exts );
+		uksort( $exts, 'strnatcasecmp' );
 
 		return $exts;
 	}