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

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 168d7edbe1..52be321f69 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -134,6 +134,7 @@ abstract class Installer {
 		'envCheckUploadsDirectory',
 		'envCheckLibicu',
 		'envCheckSuhosinMaxValueLength',
+		'envCheck64Bit',
 	];
 
 	/**
@@ -446,6 +447,7 @@ abstract class Installer {
 		$this->parserTitle = Title::newFromText( 'Installer' );
 		$this->parserOptions = new ParserOptions( $wgUser ); // language will be wrong :(
 		$this->parserOptions->setEditSection( false );
+		$this->parserOptions->setWrapOutputClass( false );
 		// Don't try to access DB before user language is initialised
 		$this->setParserLanguage( Language::factory( 'en' ) );
 	}
@@ -1080,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
@@ -1339,7 +1355,7 @@ abstract class Installer {
 	 * Reasonable values for $directory include 'extensions' (the default) and 'skins'.
 	 *
 	 * @param string $directory Directory to search in
-	 * @return array
+	 * @return array [ $extName => [ 'screenshots' => [ '...' ] ]
 	 */
 	public function findExtensions( $directory = 'extensions' ) {
 		if ( $this->getVar( 'IP' ) === null ) {
@@ -1352,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 = [];
@@ -1361,11 +1377,19 @@ abstract class Installer {
 				continue;
 			}
 			if ( file_exists( "$extDir/$file/$jsonFile" ) || file_exists( "$extDir/$file/$file.php" ) ) {
-				$exts[] = $file;
+				// Extension exists. Now see if there are screenshots
+				$exts[$file] = [];
+				if ( is_dir( "$extDir/$file/screenshots" ) ) {
+					$paths = glob( "$extDir/$file/screenshots/*.png" );
+					foreach ( $paths as $path ) {
+						$exts[$file]['screenshots'][] = str_replace( $extDir, "../$directory", $path );
+					}
+
+				}
 			}
 		}
 		closedir( $dh );
-		natcasesort( $exts );
+		uksort( $exts, 'strnatcasecmp' );
 
 		return $exts;
 	}