X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2Finstaller%2FInstaller.php;h=0bc0a8362f1c3c2b20b8562379800d0321dc4b20;hb=6c1cfca4c3536e05008e51f5754900574c36adb4;hp=20661f240d929498e69db4c6627d01263966917d;hpb=8445510fbe64c5125ce85e544855b29a576b0282;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 20661f240d..0bc0a8362f 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -686,10 +686,10 @@ abstract class Installer {
 	 * @return string
 	 */
 	public function parse( $text, $lineStart = false ) {
-		global $wgParser;
+		$parser = MediaWikiServices::getInstance()->getParser();
 
 		try {
-			$out = $wgParser->parse( $text, $this->parserTitle, $this->parserOptions, $lineStart );
+			$out = $parser->parse( $text, $this->parserTitle, $this->parserOptions, $lineStart );
 			$html = $out->getText( [
 				'enableSectionEditLinks' => false,
 				'unwrap' => true,
@@ -866,8 +866,7 @@ abstract class Installer {
 		}
 
 		if ( !$caches ) {
-			$key = 'config-no-cache-apcu';
-			$this->showMessage( $key );
+			$this->showMessage( 'config-no-cache-apcu' );
 		}
 
 		$this->setVar( '_Caches', $caches );
@@ -1184,8 +1183,8 @@ abstract class Installer {
 	public function dirIsExecutable( $dir, $url ) {
 		$scriptTypes = [
 			'php' => [
-				"<?php echo 'ex' . 'ec';",
-				"#!/var/env php\n<?php echo 'ex' . 'ec';",
+				"<?php echo 'exec';",
+				"#!/var/env php\n<?php echo 'exec';",
 			],
 		];
 
@@ -1633,8 +1632,7 @@ abstract class Installer {
 	}
 
 	/**
-	 * Generate a secret value for variables using our CryptRand generator.
-	 * Produce a warning if the random source was insecure.
+	 * Generate a secret value for variables using a secure generator.
 	 *
 	 * @param array $keys
 	 * @return Status