Update 'right-protect', 'right-autoconfirmed' messages

* The "autoconfirmed" right is now only used to determine "newbie"
  status for the purpose of rate limiting, so I updated the
  "right-autoconfirmed" message accordingly.
* The "protect" right now does not allow the user to edit protected
  pages, so I updated the "right-protect" message accordingly.
* Also removed outdated portions of code comments referring to the
  now-fixed bug identified in r31462; the 'protect' right is now
  necessary to edit any directly or indirectly cascade-protected
  page.

Follows-up I6bf650a3fbdab8589ae6945c8c916eafd949e41c.

Change-Id: Ia3cc487dd0ad168001a076ebd612eb64764e92ef

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f9d280f..f6c2a93 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4051,11 +4051,6 @@ $wgRestrictionLevels = array( '', 'autoconfirmed', 'sysop' );
  * A page can only be protected with cascading protection if the
  * requested restriction level is included in this array.
  *
- * This is intended to prevent abuse - if any protection could be
- * cascading, users could who cannot normally protect pages could
- * "protect" them by transcluding them on protected pages they are
- * allowed to edit.
- *
  * 'autoconfirmed' is quietly rewritten to 'editsemiprotected' for backwards compatibility.
  * 'sysop' is quietly rewritten to 'editprotected' for backwards compatibility.
  */

diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index 69baff1..8cf98ed 100644 (file)
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -2345,8 +2345,7 @@ class WikiPage implements Page, IDBAccessObject {
                                return Status::newGood();
                        }
 
-                       // Only certain restrictions can cascade... Otherwise, users who cannot normally protect pages
-                       // could "protect" them by transcluding them on protected pages they are allowed to edit.
+                       // Only certain restrictions can cascade...
                        $editrestriction = isset( $limit['edit'] ) ? array( $limit['edit'] ) : $this->mTitle->getRestrictions( 'edit' );
                        foreach ( array_keys( $editrestriction, 'sysop' ) as $key ) {
                                $editrestriction[$key] = 'editprotected'; // backwards compatibility

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index cc4818a..6926036 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2067,7 +2067,7 @@ Your email address is not revealed when other users contact you.',
 'right-reupload-shared'       => 'Override files on the shared media repository locally',
 'right-upload_by_url'         => 'Upload files from a URL',
 'right-purge'                 => 'Purge the site cache for a page without confirmation',
-'right-autoconfirmed'         => 'Edit semi-protected pages',
+'right-autoconfirmed'         => 'Not be affected by IP-based rate limits',
 'right-bot'                   => 'Be treated as an automated process',
 'right-nominornewtalk'        => 'Not have minor edits to discussion pages trigger the new messages prompt',
 'right-apihighlimits'         => 'Use higher limits in API queries',
@@ -2088,7 +2088,7 @@ Your email address is not revealed when other users contact you.',
 'right-ipblock-exempt'        => 'Bypass IP blocks, auto-blocks and range blocks',
 'right-proxyunbannable'       => 'Bypass automatic blocks of proxies',
 'right-unblockself'           => 'Unblock themselves',
-'right-protect'               => 'Change protection levels and edit protected pages',
+'right-protect'               => 'Change protection levels and edit cascade-protected pages',
 'right-editprotected'         => 'Edit pages protected as "{{int:protect-level-sysop}}"',
 'right-editsemiprotected'     => 'Edit pages protected as "{{int:protect-level-autoconfirmed}}"',
 'right-editinterface'         => 'Edit the user interface',

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 2ed68ee..f59bf92 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -2856,7 +2856,7 @@ Related messages:
 The right to use <tt>&action=purge</tt> in the URL, without needing to confirm it (by default, anonymous users need to confirm it).',
 'right-autoconfirmed' => "{{doc-right|autoconfirmed}}
 If your account is older than [[mw:Manual:\$wgAutoConfirmAge|wgAutoConfirmAge]] and if you have at least [[mw:Manual:\$wgAutoConfirmCount|\$wgAutoConfirmCount]] edits, you are in the '''group \"autoconfirmed\"''' (note that you can't see this group at [[Special:ListUsers]]).
-If you are in that group, you have (by default) the '''right \"autoconfirmed\"'''. With this right, you can for example <!-- I think this right includes more things --> edit semi-protected pages.",
+If you are in that group, you have (by default) the '''right \"autoconfirmed\"''', which exempts you from certain rate limits (those based on your IP address or otherwise intended solely for new users). Other rate limits may still apply; see {{msg-mw|right-noratelimit}}.",
 'right-bot' => '{{doc-right|bot}}',
 'right-nominornewtalk' => '{{doc-right|nominornewtalk}}
 If someone with this right (bots by default) edits a user talk page and marks it as minor (requires {{msg-mw|right-minoredit}}), the user will not get a notification "You have new messages".',