From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 3 Dec 2013 20:17:36 +0000 (+0000)
Subject: Merge "Set $wgNoFollowLinks to false iff "Authorized editors only" selected"
X-Git-Tag: 1.31.0-rc.0~17809
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=4960dd9b775b4f7aae2e1f1906a1f72b859415df;p=lhc%2Fweb%2Fwiklou.git

Merge "Set $wgNoFollowLinks to false iff "Authorized editors only" selected"
---

4960dd9b775b4f7aae2e1f1906a1f72b859415df
diff --cc includes/installer/LocalSettingsGenerator.php
index 301db14e94,49fbfe4f93..2433fbd41d
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@@ -220,12 -220,23 +220,23 @@@ class LocalSettingsGenerator 
  						wfBoolToStr( $perm ) . ";\n";
  				}
  			}
+ 			$noFollow = '';
+ 			if ( $this->groupPermissions['*']['edit'] === false
+ 				&& $this->groupPermissions['*']['createaccount'] === false
+ 				&& $this->groupPermissions['*']['read'] !== false ) {
+ 				$noFollow = "# Set \$wgNoFollowLinks to true if you open up your wiki to editing by\n"
+ 					. "# the general public and wish to apply nofollow to external links as a\n"
+ 					. "# deterrent to spammers. Nofollow is not a comprehensive anti-spam solution\n"
+ 					. "# and open wikis will generally require other anti-spam measures; for more\n"
+ 					. "# information, see https://www.mediawiki.org/wiki/Manual:Combating_spam\n"
+ 					. "\$wgNoFollowLinks = false;";
+ 			}
  		}
  
 -		$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'] ) {