From 6088f8b15177d369463864781c36394441b810bc Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 6 Mar 2007 14:21:12 +0000 Subject: [PATCH] Revert r20162; changes behavior of sites that restrict editing, potentially unsafely (for instance if raw HTML is enabled), without even a warning. --- includes/DefaultSettings.php | 2 -- includes/EditPage.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) 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(); -- 2.20.1