| Index: branches/REL1_5/phase3/includes/SpecialRecentchanges.php |
| — | — | @@ -33,6 +33,7 @@ |
| 34 | 34 | /* bool */ 'hidebots' => true, |
| 35 | 35 | /* bool */ 'hideliu' => false, |
| 36 | 36 | /* bool */ 'hidepatrolled' => false, |
| | 37 | + /* bool */ 'hidemyself' => false, |
| 37 | 38 | /* text */ 'from' => '', |
| 38 | 39 | /* text */ 'namespace' => null, |
| 39 | 40 | /* bool */ 'invert' => false, |
| — | — | @@ -52,8 +53,7 @@ |
| 53 | 54 | $limit = $wgRequest->getInt( 'limit', $limit ); |
| 54 | 55 | |
| 55 | 56 | /* order of selection: url > preferences > default */ |
| 56 | | - $hideminor = $wgRequest->getBool( 'hideminor', $wgUser->getOption( 'hideminor') ? true : $defaults['hideminor'] ); |
| 57 | | - |
| | 57 | + $hideminor = $wgRequest->getBool( 'hideminor', $wgUser->getOption( 'hideminor') ? true : $defaults['hideminor'] ); |
| 58 | 58 | |
| 59 | 59 | # As a feed, use limited settings only |
| 60 | 60 | if( $feedFormat ) { |
| — | — | @@ -69,6 +69,7 @@ |
| 70 | 70 | $hidebots = $wgRequest->getBool( 'hidebots', $defaults['hidebots'] ); |
| 71 | 71 | $hideliu = $wgRequest->getBool( 'hideliu', $defaults['hideliu'] ); |
| 72 | 72 | $hidepatrolled = $wgRequest->getBool( 'hidepatrolled', $defaults['hidepatrolled'] ); |
| | 73 | + $hidemyself = $wgRequest->getBool ( 'hidemyself', $defaults['hidemyself'] ); |
| 73 | 74 | $from = $wgRequest->getVal( 'from', $defaults['from'] ); |
| 74 | 75 | |
| 75 | 76 | # Get query parameters from path |
| — | — | @@ -81,6 +82,7 @@ |
| 82 | 83 | if ( 'minor' == $bit ) $hideminor = 0; |
| 83 | 84 | if ( 'hideliu' == $bit ) $hideliu = 1; |
| 84 | 85 | if ( 'hidepatrolled' == $bit ) $hidepatrolled = 1; |
| | 86 | + if ( 'hidemyself' == $bit ) $hidemyself = 1; |
| 85 | 87 | |
| 86 | 88 | if ( is_numeric( $bit ) ) { |
| 87 | 89 | $limit = $bit; |
| — | — | @@ -129,8 +131,9 @@ |
| 130 | 132 | |
| 131 | 133 | $hidem = $hideminor ? 'AND rc_minor=0' : ''; |
| 132 | 134 | $hidem .= $hidebots ? ' AND rc_bot=0' : ''; |
| 133 | | - $hidem .= $hideliu ? ' AND rc_user=0' : ''; |
| | 135 | + $hidem .= ( $hideliu && !$hidemyself ) ? ' AND rc_user=0' : ''; |
| 134 | 136 | $hidem .= $hidepatrolled ? ' AND rc_patrolled=0' : ''; |
| | 137 | + $hidem .= $hidemyself ? ' AND rc_user <> '.$wgUser->getID() : ''; |
| 135 | 138 | $hidem .= is_null( $namespace ) ? '' : ' AND rc_namespace' . ($invert ? '!=' : '=') . $namespace; |
| 136 | 139 | |
| 137 | 140 | // This is the big thing! |
| — | — | @@ -183,6 +186,7 @@ |
| 184 | 187 | wfAppendToArrayIfNotDefault( 'hidebots', $hidebots, $defaults, $nondefaults); |
| 185 | 188 | wfAppendToArrayIfNotDefault( 'hideliu', $hideliu, $defaults, $nondefaults); |
| 186 | 189 | wfAppendToArrayIfNotDefault( 'hidepatrolled', $hidepatrolled, $defaults, $nondefaults); |
| | 190 | + wfAppendToArrayIfNotDefault( 'hidemyself', $hidemyself, $defaults, $nondefaults); |
| 187 | 191 | wfAppendToArrayIfNotDefault( 'from', $from, $defaults, $nondefaults); |
| 188 | 192 | wfAppendToArrayIfNotDefault( 'namespace', $namespace, $defaults, $nondefaults); |
| 189 | 193 | wfAppendToArrayIfNotDefault( 'invert', $invert, $defaults, $nondefaults); |
| — | — | @@ -358,7 +362,7 @@ |
| 359 | 363 | * Used by Recentchangeslinked |
| 360 | 364 | */ |
| 361 | 365 | function rcDayLimitLinks( $days, $limit, $page='Recentchanges', $more='', $doall = false, $minorLink = '', |
| 362 | | - $botLink = '', $liuLink = '', $patrLink = '' ) { |
| | 366 | + $botLink = '', $liuLink = '', $patrLink = '', $myselfLink = '' ) { |
| 363 | 367 | if ($more != '') $more .= '&'; |
| 364 | 368 | $cl = rcCountLink( 50, $days, $page, $more ) . ' | ' . |
| 365 | 369 | rcCountLink( 100, $days, $page, $more ) . ' | ' . |
| — | — | @@ -371,7 +375,7 @@ |
| 372 | 376 | rcDaysLink( $limit, 14, $page, $more ) . ' | ' . |
| 373 | 377 | rcDaysLink( $limit, 30, $page, $more ) . |
| 374 | 378 | ( $doall ? ( ' | ' . rcDaysLink( $limit, 0, $page, $more ) ) : '' ); |
| 375 | | - $shm = wfMsg( 'showhideminor', $minorLink, $botLink, $liuLink, $patrLink ); |
| | 379 | + $shm = wfMsg( 'showhideminor', $minorLink, $botLink, $liuLink, $patrLink, $myselfLink ); |
| 376 | 380 | $note = wfMsg( 'rclinks', $cl, $dl, $shm ); |
| 377 | 381 | return $note; |
| 378 | 382 | } |
| — | — | @@ -430,8 +434,9 @@ |
| 431 | 435 | array( 'hideliu' => 1-$options['hideliu'] ), $nondefaults); |
| 432 | 436 | $patrLink = makeOptionsLink( $showhide[1-$options['hidepatrolled']], |
| 433 | 437 | array( 'hidepatrolled' => 1-$options['hidepatrolled'] ), $nondefaults); |
| 434 | | - |
| 435 | | - $hl = wfMsg( 'showhideminor', $minorLink, $botLink, $liuLink, $patrLink ); |
| | 438 | + $myselfLink = makeOptionsLink( $showhide[1-$options['hidemyself']], |
| | 439 | + array( 'hidemyself' => 1-$options['hidemyself'] ), $nondefaults); |
| | 440 | + $hl = wfMsg( 'showhideminor', $minorLink, $botLink, $liuLink, $patrLink, $myselfLink ); |
| 436 | 441 | |
| 437 | 442 | // show from this onward link |
| 438 | 443 | $now = $wgLang->timeanddate( wfTimestampNow(), true ); |