From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 6 Mar 2007 14:21:12 +0000 (+0000)
Subject: Revert r20162; changes behavior of sites that restrict editing, potentially
X-Git-Tag: 1.31.0-rc.0~53890
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=6088f8b15177d369463864781c36394441b810bc;p=lhc%2Fweb%2Fwiklou.git

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 4a1e6f189c..98b94d4b5f 100644
--- 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 1afe416d84..1c16dc2b5e 100644
--- 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();