Prevent blocked users from changing page protection levels

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4112e37..1b385fb 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -411,7 +411,7 @@ fully support the editing toolbar, but was found to be too confusing.
   which are not of known image types. This is in response to
   http://en.wikipedia.org/wiki/Windows_Metafile_vulnerability
 * (bug 4507) Adjust FULLPAGENAMEE escaping to standard form
-* Blocked users can no longer use rollback, or delete/undelete pages
+* Blocked users can no longer roll back, change the protection of, or delete/undelete pages
 
 
 === Caveats ===

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index c0c666a..b0b31bb 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -41,7 +41,7 @@ class ProtectionForm {
                }
                
                // The form will be available in read-only to show levels.
-               $this->disabled = !$wgUser->isAllowed( 'protect' ) || wfReadOnly();
+               $this->disabled = !$wgUser->isAllowed( 'protect' ) || wfReadOnly() || $wgUser->isBlocked();
                $this->disabledAttrib = $this->disabled
                        ? array( 'disabled' => 'disabled' )
                        : array();