MarkAHershberger has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/141307

Change subject: Don't allow some E_NOTICE messages to end up in the 
LocalSettings.php
......................................................................

Don't allow some E_NOTICE messages to end up in the LocalSettings.php

There is probably a better, more comprehensive way to produce a
LocalSettings.php file so that E_STRICT and E_NOTICE errors don't end
up in the file, or to notify users that there is a problem with the
generated file, at least.   This only attempts to address those issues
reported as a result of c978cee8562f018dab158b41e15266fcf873bf1b.

Bug: 66922
Change-Id: I0fe70446d9fe23aed2a147e20e5ff3851371726d
---
M includes/installer/LocalSettingsGenerator.php
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/07/141307/1

diff --git a/includes/installer/LocalSettingsGenerator.php 
b/includes/installer/LocalSettingsGenerator.php
index fe036ad..162bede 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -221,9 +221,12 @@
                                                wfBoolToStr( $perm ) . ";\n";
                                }
                        }
-                       if ( $this->groupPermissions['*']['edit'] === false
-                               && 
$this->groupPermissions['*']['createaccount'] === false
-                               && $this->groupPermissions['*']['read'] !== 
false
+                       if ( ( isset( $this->groupPermissions['*']['edit'] ) &&
+                                       $this->groupPermissions['*']['edit'] 
=== false )
+                               && ( isset( 
$this->groupPermissions['*']['createaccount'] ) &&
+                                       
$this->groupPermissions['*']['createaccount'] === false )
+                               && ( isset( 
$this->groupPermissions['*']['read'] ) &&
+                                       $this->groupPermissions['*']['read'] 
!== false )
                        ) {
                                $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"

-- 
To view, visit https://gerrit.wikimedia.org/r/141307
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fe70446d9fe23aed2a147e20e5ff3851371726d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: MarkAHershberger <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to