* (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 ;)

This commit is contained in:
Rob Church 2006-12-18 21:39:36 +00:00
parent de0ce709d1
commit 1be955f1ba
5 changed files with 6 additions and 8 deletions

View file

@ -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 ==

View file

@ -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 );
}
}

View file

@ -857,11 +857,9 @@ class PreferencesForm {
'externaleditor',
'externaldiff',
$wgLivePreview ? 'uselivepreview' : false,
$wgUser->isAllowed( 'patrol' ) && $wgUseRCPatrol ? 'autopatrol' : false,
'forceeditsummary',
) ) . '</fieldset>'
);
$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( '<fieldset><legend>' . htmlspecialchars(wfMsg('prefs-rc')) . '</legend>' .
wfInputLabel( wfMsg( 'recentchangescount' ),

View file

@ -65,7 +65,6 @@ class User {
'externaldiff',
'showjumplinks',
'uselivepreview',
'autopatrol',
'forceeditsummary',
'watchlisthideown',
'watchlisthidebots',

View file

@ -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',