Partially reverting r31247:

* With that, it was possible to transclude a page in a protected pag with with cascading option selected, thus making the transcluded page protected.. without having protect rights :(
* I'm keeping the editproected permission there in DefaultSettings.php, because it will be used in the "correct" solution to this bug.
* Thanks for ialex for pointing out what I just missed.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2f14227..222b23a 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -21,9 +21,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 === Configuration changes in 1.13 ===
 
 * New option $wgFeed can be set false to turn off syndication feeds
-* (bug 13137) Allow setting 'editprotected' right separately from 'protect',
-  so groups may optionally edit protected pages without being able to protect
-  pages themselves
 
 === New features in 1.13 ===
 

diff --git a/includes/Title.php b/includes/Title.php
index d116427..6f94c88 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1195,7 +1195,7 @@ class Title {
                foreach( $this->getRestrictions($action) as $right ) {
                        // Backwards compatibility, rewrite sysop -> protect
                        if ( $right == 'sysop' ) {
-                               $right = 'editprotected';
+                               $right = 'protect';
                        }
                        if( '' != $right && !$user->isAllowed( $right ) ) {
                                $errors[] = array( 'protectedpagetext', $right );