leucosticte has uploaded a new change for review.
https://gerrit.wikimedia.org/r/99654
Change subject: Move init of $noFollow outside of if
......................................................................
Move init of $noFollow outside of if
Bug: 58044
Change-Id: I5655a0dc64055f3ec5d0a287aa8e0c85c11d3a1f
---
M includes/installer/LocalSettingsGenerator.php
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/54/99654/1
diff --git a/includes/installer/LocalSettingsGenerator.php
b/includes/installer/LocalSettingsGenerator.php
index 2433fbd..515cedb 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -210,6 +210,7 @@
}
$groupRights = '';
+ $noFollow = '';
if ( $this->groupPermissions ) {
$groupRights .= "# The following permissions were set
based on your choice in the installer\n";
foreach ( $this->groupPermissions as $group =>
$rightArr ) {
@@ -220,11 +221,10 @@
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"
+ $noFollow = "\n# 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"
@@ -364,7 +364,6 @@
# Path to the GNU diff3 utility. Used for conflict resolution.
\$wgDiff3 = \"{$this->values['wgDiff3']}\";
-{$groupRights}
-{$noFollow}";
+{$groupRights}{$noFollow}";
}
}
--
To view, visit https://gerrit.wikimedia.org/r/99654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5655a0dc64055f3ec5d0a287aa8e0c85c11d3a1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: leucosticte <nathanlarson3...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
