Revert r50180 ("Proper error message on action=protect"): causes bug 18728 ("Non...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 89234eb..4b27bd1 100644 (file)
--- 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 02c233c..6046cf5 100644 (file)
--- 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();
        }