| Index: trunk/phase3/includes/User.php |
| — | — | @@ -1013,9 +1013,13 @@ |
| 1014 | 1014 | * @return \type{\arrayof{\string}} Array of user toggle names |
| 1015 | 1015 | */ |
| 1016 | 1016 | static function getToggles() { |
| 1017 | | - global $wgContLang; |
| | 1017 | + global $wgContLang, $wgUseRCPatrol; |
| 1018 | 1018 | $extraToggles = array(); |
| 1019 | 1019 | wfRunHooks( 'UserToggles', array( &$extraToggles ) ); |
| | 1020 | + if( $wgUseRCPatrol ) { |
| | 1021 | + $extraToggles[] = 'hidepatrolled'; |
| | 1022 | + $extraToggles[] = 'watchlisthidepatrolled'; |
| | 1023 | + } |
| 1020 | 1024 | return array_merge( self::$mToggles, $extraToggles, $wgContLang->getExtraUserToggles() ); |
| 1021 | 1025 | } |
| 1022 | 1026 | |
| Index: trunk/phase3/includes/specials/SpecialPreferences.php |
| — | — | @@ -1093,6 +1093,7 @@ |
| 1094 | 1094 | ); |
| 1095 | 1095 | |
| 1096 | 1096 | $toggles[] = 'hideminor'; |
| | 1097 | + $toggles[] = 'hidepatrolled'; |
| 1097 | 1098 | if( $wgRCShowWatchingUsers ) |
| 1098 | 1099 | $toggles[] = 'shownumberswatching'; |
| 1099 | 1100 | $toggles[] = 'usenewrc'; |
| — | — | @@ -1112,7 +1113,8 @@ |
| 1113 | 1114 | Xml::inputLabel( wfMsg( 'prefs-watchlist-edits' ), 'wpWatchlistEdits', 'wpWatchlistEdits', 3, $this->mWatchlistEdits ) . ' ' . |
| 1114 | 1115 | wfMsgHTML( 'prefs-watchlist-edits-max' ) . |
| 1115 | 1116 | '<br /><br />' . |
| 1116 | | - $this->getToggles( array( 'watchlisthideminor', 'watchlisthidebots', 'watchlisthideown', 'watchlisthideanons', 'watchlisthideliu' ) ) |
| | 1117 | + $this->getToggles( array( 'watchlisthideminor', 'watchlisthidebots', 'watchlisthideown', |
| | 1118 | + 'watchlisthideanons', 'watchlisthideliu', 'watchlisthidepatrolled' ) ) |
| 1117 | 1119 | ); |
| 1118 | 1120 | |
| 1119 | 1121 | if( $wgUser->isAllowed( 'createpage' ) || $wgUser->isAllowed( 'createtalk' ) ) { |
| Index: trunk/phase3/includes/specials/SpecialRecentchanges.php |
| — | — | @@ -23,11 +23,11 @@ |
| 24 | 24 | $opts->add( 'limit', (int)$wgUser->getOption( 'rclimit' ) ); |
| 25 | 25 | $opts->add( 'from', '' ); |
| 26 | 26 | |
| 27 | | - $opts->add( 'hideminor', (bool)$wgUser->getOption( 'hideminor' ) ); |
| | 27 | + $opts->add( 'hideminor', $wgUser->getBoolOption( 'hideminor' ) ); |
| 28 | 28 | $opts->add( 'hidebots', true ); |
| 29 | 29 | $opts->add( 'hideanons', false ); |
| 30 | 30 | $opts->add( 'hideliu', false ); |
| 31 | | - $opts->add( 'hidepatrolled', false ); |
| | 31 | + $opts->add( 'hidepatrolled', $wgUser->getBoolOption( 'hidepatrolled' ) ); |
| 32 | 32 | $opts->add( 'hidemyself', false ); |
| 33 | 33 | |
| 34 | 34 | $opts->add( 'namespace', '', FormOptions::INTNULL ); |
| Index: trunk/phase3/includes/specials/SpecialWatchlist.php |
| — | — | @@ -54,7 +54,7 @@ |
| 55 | 55 | /* bool */ 'hideBots' => (int)$wgUser->getBoolOption( 'watchlisthidebots' ), |
| 56 | 56 | /* bool */ 'hideAnons' => (int)$wgUser->getBoolOption( 'watchlisthideanons' ), |
| 57 | 57 | /* bool */ 'hideLiu' => (int)$wgUser->getBoolOption( 'watchlisthideliu' ), |
| 58 | | - /* bool */ 'hidePatrolled' => (int)$wgUser->getBoolOption( 'watchlisthidepatrolled' ), // TODO |
| | 58 | + /* bool */ 'hidePatrolled' => (int)$wgUser->getBoolOption( 'watchlisthidepatrolled' ), |
| 59 | 59 | /* bool */ 'hideOwn' => (int)$wgUser->getBoolOption( 'watchlisthideown' ), |
| 60 | 60 | /* ? */ 'namespace' => 'all', |
| 61 | 61 | /* ? */ 'invert' => false, |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -490,6 +490,7 @@ |
| 491 | 491 | 'tog-highlightbroken' => 'Format broken links <a href="" class="new">like this</a> (alternative: like this<a href="" class="internal">?</a>).', |
| 492 | 492 | 'tog-justify' => 'Justify paragraphs', |
| 493 | 493 | 'tog-hideminor' => 'Hide minor edits in recent changes', |
| | 494 | +'tog-hidepatrolled' => 'Hide patrolled edits in recent changes', |
| 494 | 495 | 'tog-extendwatchlist' => 'Expand watchlist to show all applicable changes', |
| 495 | 496 | 'tog-usenewrc' => 'Enhanced recent changes (JavaScript)', |
| 496 | 497 | 'tog-numberheadings' => 'Auto-number headings', |
| — | — | @@ -524,6 +525,7 @@ |
| 525 | 526 | 'tog-watchlisthideminor' => 'Hide minor edits from the watchlist', |
| 526 | 527 | 'tog-watchlisthideliu' => 'Hide edits by logged in users from the watchlist', |
| 527 | 528 | 'tog-watchlisthideanons' => 'Hide edits by anonymous users from the watchlist', |
| | 529 | +'tog-watchlisthidepatrolled' => 'Hide patrolled edits from the watchlist', |
| 528 | 530 | 'tog-nolangconversion' => 'Disable variants conversion', # only translate this message to other languages if you have to change it |
| 529 | 531 | 'tog-ccmeonemails' => 'Send me copies of e-mails I send to other users', |
| 530 | 532 | 'tog-diffonly' => 'Do not show page content below diffs', |