Revert r20162; changes behavior of sites that restrict editing, potentially

unsafely (for instance if raw HTML is enabled), without even a warning.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 4a1e6f1..98b94d4 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -959,7 +959,6 @@ $wgGroupPermissions = array();
 $wgGroupPermissions['*'    ]['createaccount']   = true;
 $wgGroupPermissions['*'    ]['read']            = true;
 $wgGroupPermissions['*'    ]['edit']            = true;
-$wgGroupPermissions['*'    ]['edittalk']        = true;
 $wgGroupPermissions['*'    ]['createpage']      = true;
 $wgGroupPermissions['*'    ]['createtalk']      = true;
 
@@ -967,7 +966,6 @@ $wgGroupPermissions['*'    ]['createtalk']      = true;
 $wgGroupPermissions['user' ]['move']            = true;
 $wgGroupPermissions['user' ]['read']            = true;
 $wgGroupPermissions['user' ]['edit']            = true;
-$wgGroupPermissions['user' ]['edittalk']        = true;
 $wgGroupPermissions['user' ]['createpage']      = true;
 $wgGroupPermissions['user' ]['createtalk']      = true;
 $wgGroupPermissions['user' ]['upload']          = true;

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 1afe416..1c16dc2 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -324,7 +324,7 @@ class EditPage {
                        wfProfileOut( $fname );
                        return;
                }
-               if ( (!$this->mTitle->isTalkPage() && !$wgUser->isAllowed('edit')) || ($this->mTitle->isTalkPage() && !$wgUser->isAllowed('edittalk')) ) {
+               if ( !$wgUser->isAllowed('edit') ) {
                        if ( $wgUser->isAnon() ) {
                                wfDebug( "$fname: user must log in\n" );
                                $this->userNotLoggedInPage();