X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Finstaller%2FLocalSettingsGenerator.php;h=301db14e946b587c00cc9d18a49d295c4198b710;hb=e28c21fe9a97c1832fe82713c74207eb4b9beb42;hp=858fbeef8e5ca112eb87eb8d15c703117f6686e9;hpb=91f5f1770879066931d18946e205e37e2c1fcf5f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index 858fbeef8e..301db14e94 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -202,7 +202,7 @@ class LocalSettingsGenerator {
 			$locale = '';
 		}
 
-		//$rightsUrl = $this->values['wgRightsUrl'] ? '' : '#'; // TODO: Fixme, I'm unused!
+		//$rightsUrl = $this->values['wgRightsUrl'] ? '' : '#'; // @todo FIXME: I'm unused!
 		$hashedUploads = $this->safeMode ? '' : '#';
 		$metaNamespace = '';
 		if ( $this->values['wgMetaNamespace'] !== $this->values['wgSitename'] ) {
@@ -222,10 +222,10 @@ class LocalSettingsGenerator {
 			}
 		}
 
-		$wgServerSetting = "";
+		$serverSetting = "";
 		if ( array_key_exists( 'wgServer', $this->values ) && $this->values['wgServer'] !== null ) {
-			$wgServerSetting = "\n## The protocol and server name to use in fully-qualified URLs\n";
-			$wgServerSetting .= "\$wgServer = \"{$this->values['wgServer']}\";\n";
+			$serverSetting = "\n## The protocol and server name to use in fully-qualified URLs\n";
+			$serverSetting .= "\$wgServer = \"{$this->values['wgServer']}\";\n";
 		}
 
 		switch ( $this->values['wgMainCacheType'] ) {
@@ -271,7 +271,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 ## http://www.mediawiki.org/wiki/Manual:Short_URL
 \$wgScriptPath = \"{$this->values['wgScriptPath']}\";
 \$wgScriptExtension = \"{$this->values['wgScriptExtension']}\";
-${wgServerSetting}
+${serverSetting}
 ## The relative URL path to the skins directory
 \$wgStylePath = \"\$wgScriptPath/skins\";