From 1be955f1bacd2a96d4d63e6195edab3ba0aa8431 Mon Sep 17 00:00:00 2001 From: Rob Church Date: Mon, 18 Dec 2006 21:39:36 +0000 Subject: [PATCH] * (bug 5411) Remove autopatrol preference; users who can mark edits patrolled will now have their edits marked as such regardless - per Brion's enthusiasm on the mailing list ;) --- RELEASE-NOTES | 2 ++ includes/Article.php | 8 ++++---- includes/SpecialPreferences.php | 2 -- includes/User.php | 1 - languages/messages/MessagesEn.php | 1 - 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index e19b27ee76..5b39a3d78c 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -345,6 +345,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * Don't show "you can view and copy the source of this page" message for pages which don't exist * (bug 8310) Blank line added to top of 'post' when page is blank +* (bug 5411) Remove autopatrol preference; users who can mark edits patrolled + will now have their edits marked as such regardless == Languages updated == diff --git a/includes/Article.php b/includes/Article.php index 5356c2a8c9..0d696ce0bc 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -1339,8 +1339,8 @@ class Article { $lastRevision, $this->getTimestamp(), $bot, '', $oldsize, $newsize, $revisionId ); - # Mark as patrolled if the user can do so and has it set in their options - if( $wgUser->isAllowed( 'patrol' ) && $wgUser->getOption( 'autopatrol' ) ) { + # Mark as patrolled if the user can do so + if( $wgUser->isAllowed( 'patrol' ) ) { RecentChange::markPatrolled( $rcid ); } } @@ -1400,8 +1400,8 @@ class Article { if( !( $flags & EDIT_SUPPRESS_RC ) ) { $rcid = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary, $bot, '', strlen( $text ), $revisionId ); - # Mark as patrolled if the user can and has the option set - if( $wgUser->isAllowed( 'patrol' ) && $wgUser->getOption( 'autopatrol' ) ) { + # Mark as patrolled if the user can + if( $wgUser->isAllowed( 'patrol' ) ) { RecentChange::markPatrolled( $rcid ); } } diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php index 813afece14..05318a1137 100644 --- a/includes/SpecialPreferences.php +++ b/includes/SpecialPreferences.php @@ -857,11 +857,9 @@ class PreferencesForm { 'externaleditor', 'externaldiff', $wgLivePreview ? 'uselivepreview' : false, - $wgUser->isAllowed( 'patrol' ) && $wgUseRCPatrol ? 'autopatrol' : false, 'forceeditsummary', ) ) . '' ); - $this->mUsedToggles['autopatrol'] = true; # Don't show this up for users who can't; the handler below is dumb and doesn't know it $wgOut->addHTML( '
' . htmlspecialchars(wfMsg('prefs-rc')) . '' . wfInputLabel( wfMsg( 'recentchangescount' ), diff --git a/includes/User.php b/includes/User.php index 7001ddb4e0..0dacab26dd 100644 --- a/includes/User.php +++ b/includes/User.php @@ -65,7 +65,6 @@ class User { 'externaldiff', 'showjumplinks', 'uselivepreview', - 'autopatrol', 'forceeditsummary', 'watchlisthideown', 'watchlisthidebots', diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index ebbb4f7628..f0d707aa8c 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -480,7 +480,6 @@ parent class in order maintain consistency across languages. 'tog-externaldiff' => 'Use external diff by default', 'tog-showjumplinks' => 'Enable "jump to" accessibility links', 'tog-uselivepreview' => 'Use live preview (JavaScript) (Experimental)', -'tog-autopatrol' => 'Mark edits I make as patrolled', 'tog-forceeditsummary' => 'Prompt me when entering a blank edit summary', 'tog-watchlisthideown' => 'Hide my edits from the watchlist', 'tog-watchlisthidebots' => 'Hide bot edits from the watchlist', -- 2.20.1