From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Sun, 10 May 2009 09:18:23 +0000 (+0000)
Subject: Revert r50180 ("Proper error message on action=protect"): causes bug 18728 ("Non... 
X-Git-Tag: 1.31.0-rc.0~41831
X-Git-Url: http://git.cyclocoop.org/%22.%20generer_url_ecrire%28%22sites_tous%22%2C%22%22%29.%20%22?a=commitdiff_plain;h=ca7ecd5627d73c75d7dbc7347f8cd8eb22e3d216;p=lhc%2Fweb%2Fwiklou.git

Revert r50180 ("Proper error message on action=protect"): causes bug 18728 ("Non-admins can no longer see protection settings")
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 89234eb6bf..4b27bd1690 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -110,8 +110,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Removed float from the user login form in RTL interface - caused display
   problems in FF2
 * (bug 15008) Redirect images are now subject to Bad image list rules
-* (bug 18677) Give proper error message when viewing &action=protect without
-  sufficient rights
 * (bug 6802) profileinfo.php now also work on other database servers than MySQL
 * (bug 16925) Diffs no longer fail when $wgExternalDiffEngine is set to 'wikidiff'
   or 'wikidiff2' but extension is not installed
diff --git a/includes/Article.php b/includes/Article.php
index 02c233c994..6046cf5863 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1962,16 +1962,6 @@ class Article {
 	 * action=protect handler
 	 */
 	public function protect() {
-		global $wgUser, $wgOut;
-		
-		# Check permissions
-		$permission_errors = $this->mTitle->getUserPermissionsErrors( 'protect', $wgUser );
-
-		if( count( $permission_errors ) > 0 ) {
-			$wgOut->showPermissionsErrorPage( $permission_errors );
-			return;
-		}
-	
 		$form = new ProtectionForm( $this );
 		$form->execute();
 	}