| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1193,7 +1193,18 @@ |
| 1194 | 1194 | $right = 'protect'; |
| 1195 | 1195 | } |
| 1196 | 1196 | if( '' != $right && !$user->isAllowed( $right ) ) { |
| 1197 | | - $errors[] = array( 'protectedpagetext', $right ); |
| | 1197 | + //Users with 'editprotected' permission can edit protected pages |
| | 1198 | + if( $action=='edit' && $user->isAllowed( 'editprotected' ) ) { |
| | 1199 | + //Users with 'editprotected' permission cannot edit protected pages |
| | 1200 | + //with cascading option turned on. |
| | 1201 | + if($this->mCascadeRestriction) { |
| | 1202 | + $errors[] = array( 'protectedpagetext', $right ); |
| | 1203 | + } else { |
| | 1204 | + //Nothing, user can edit! |
| | 1205 | + } |
| | 1206 | + } else { |
| | 1207 | + $errors[] = array( 'protectedpagetext', $right ); |
| | 1208 | + } |
| 1198 | 1209 | } |
| 1199 | 1210 | } |
| 1200 | 1211 | |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1132,7 +1132,6 @@ |
| 1133 | 1133 | $wgGroupPermissions['sysop']['patrol'] = true; |
| 1134 | 1134 | $wgGroupPermissions['sysop']['autopatrol'] = true; |
| 1135 | 1135 | $wgGroupPermissions['sysop']['protect'] = true; |
| 1136 | | -$wgGroupPermissions['sysop']['editprotected'] = true; |
| 1137 | 1136 | $wgGroupPermissions['sysop']['proxyunbannable'] = true; |
| 1138 | 1137 | $wgGroupPermissions['sysop']['rollback'] = true; |
| 1139 | 1138 | $wgGroupPermissions['sysop']['trackback'] = true; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -115,18 +115,22 @@ |
| 116 | 116 | * Implemented {bl,ei,iu}redirect (lists links through redirects as well) |
| 117 | 117 | * (bug 13154) Introduced subpages flag to meta=siteinfo&siprop=namespaces |
| 118 | 118 | * (bug 13157) Added ucuserprefix parameter to list=usercontibs |
| 119 | | -* (bug 12394) Added rctitles parameter to list=recentchanges, making rcid retrieval easier |
| | 119 | +* (bug 12394) Added rctitles parameter to list=recentchanges, making rcid |
| | 120 | + retrieval easier |
| 120 | 121 | * (bug 13218) Fix inclusion of " character in hyperlinks |
| 121 | 122 | * Added watch and unwatch parameters to action=delete and action=move |
| 122 | 123 | * Added action=edit |
| 123 | 124 | * (bug 11401) Added xmldoublequote to xml formatter |
| 124 | | -* Added rvsection parameter to prop=revisions to allow fetching the content of a certain section only |
| | 125 | +* Added rvsection parameter to prop=revisions to allow fetching the content of |
| | 126 | + a certain section only |
| 125 | 127 | * Introduced list=allimages |
| 126 | 128 | * (bug 13371) Build page set from image hashes |
| 127 | 129 | * Mark non-existent messages in meta=allmessages as missing |
| 128 | 130 | * (bug 13390) One invalid title no longer kills an entire API query |
| 129 | 131 | * (bug 13419) Fix gblredirect so it actually works |
| 130 | 132 | * (bug 13418) Disable eiredirect because it's useless |
| | 133 | +* (bug 13137) Allow setting 'editprotected' right separately from 'protect', |
| | 134 | + so groups may optionally edit protected pages without having 'protect' perms |
| 131 | 135 | |
| 132 | 136 | === Languages updated in 1.13 === |
| 133 | 137 | |