Index: includes/SpecialWatchlist.php =================================================================== RCS file: /cvsroot/wikipedia/phase3/includes/SpecialWatchlist.php,v retrieving revision 1.73 diff -u -r1.73 SpecialWatchlist.php --- includes/SpecialWatchlist.php 7 Jan 2006 13:31:26 -0000 1.73 +++ includes/SpecialWatchlist.php 4 Feb 2006 05:53:26 -0000 @@ -37,6 +37,7 @@ /* float */ 'days' => 3.0, /* or 0.5, watch further below */ /* bool */ 'hideOwn' => false, /* bool */ 'hideBots' => false, + /* bool */ 'hideTalk' => false ); extract($defaults); @@ -45,6 +46,7 @@ $days = $wgRequest->getVal( 'days' ); $hideOwn = $wgRequest->getBool( 'hideOwn' ); $hideBots = $wgRequest->getBool( 'hideBots' ); + $hideTalk = $wgRequest->getBool( 'hideTalk' ); # Watchlist editing $action = $wgRequest->getVal( 'action' ); @@ -121,6 +123,7 @@ wfAppendToArrayIfNotDefault( 'days', $days, $defaults, $nondefaults); wfAppendToArrayIfNotDefault( 'hideOwn', $hideOwn, $defaults, $nondefaults); wfAppendToArrayIfNotDefault( 'hideBots', $hideBots, $defaults, $nondefaults); + wfAppendToArrayIfNotDefault( 'hideTalk', $hideTalk, $defaults, $nondefaults); if ( $days <= 0 ) { $docutoff = ''; @@ -210,6 +213,8 @@ } else { $andHideBotsOptional = "AND rc_this_oldid=page_latest"; } + + $andHideTalk = $hideTalk ? ( "AND ( page_namespace < " . NS_MAIN . " || MOD(page_namespace, 2) = 0 )" ) : '' ; # Show watchlist header @@ -252,6 +257,7 @@ AND rc_cur_id=page_id $andHideOwn $andHideBotsOptional + $andHideTalk ORDER BY rc_timestamp DESC"; $res = $dbr->query( $sql, $fname ); @@ -276,6 +282,14 @@ wfArrayToCGI( array('hideOwn' => 1-$hideOwn ), $nondefaults ) ); $wgOut->addHTML( wfMsgHtml( "wlhideshowown", $s ) ); + $wgOut->addHTML( ' ' ); + + $s = $sk->makeKnownLink( + $wgContLang->specialPage( 'Watchlist' ), + (0 == $hideTalk) ? wfMsgHtml( 'wlhide' ) : wfMsgHtml( 'wlshow' ), + wfArrayToCGI( array('hideTalk' => 1-$hideTalk ), $nondefaults ) ); + $wgOut->addHTML( wfMsgHtml( "wlhideshowtalk", $s ) ); + if( $wgFilterRobotsWL ) { $s = $sk->makeKnownLink( $wgContLang->specialPage( 'Watchlist' ), Index: languages/Messages.php =================================================================== RCS file: /cvsroot/wikipedia/phase3/languages/Messages.php,v retrieving revision 1.1 diff -u -r1.1 Messages.php --- languages/Messages.php 22 Jan 2006 00:49:58 -0000 1.1 +++ languages/Messages.php 4 Feb 2006 05:53:27 -0000 @@ -1036,6 +1036,7 @@ 'wlshowlast' => 'Show last $1 hours $2 days $3', 'wlsaved' => 'This is a saved version of your watchlist.', 'wlhideshowown' => '$1 my edits.', +'wlhideshowtalk' => '$1 talk pages.', 'wlhideshowbots' => '$1 bot edits.', 'wlshow' => 'Show', 'wlhide' => 'Hide',