Hello,
Op Sunday 18 May 2008 01:39:20 schreef aaron(a)svn.wikimedia.org:
Revision: 35002
Author: aaron
Date: 2008-05-17 23:39:20 +0000 (Sat, 17 May 2008)
Log Message:
-----------
Respect $wgShowUpdatedMarker
Modified Paths:
--------------
trunk/phase3/includes/SpecialWatchlist.php
trunk/phase3/includes/User.php
Modified: trunk/phase3/includes/SpecialWatchlist.php
===================================================================
--- trunk/phase3/includes/SpecialWatchlist.php 2008-05-17 23:34:28 UTC (rev
35001) +++ trunk/phase3/includes/SpecialWatchlist.php 2008-05-17 23:39:20
UTC (rev 35002)
(...)
@@ -154,7 +154,7 @@
if( $wgUser->getOption( 'enotifwatchlistpages' ) &&
$wgEnotifWatchlist) {
$header .= wfMsg( 'wlheader-enotif' ) . "\n";
}
- if ( $wgEnotifWatchlist && $wgShowUpdatedMarker ) {
+ if ( $wgEnotifWatchlist || $wgShowUpdatedMarker ) {
$header .= wfMsg( 'wlheader-showupdated' ) . "\n";
}
This should be "if ( $wgShowUpdatedMarker ) {". A notice "Pages which have
been changed since you last visited them are shown in bold" when
$wgShowUpdatedMarker = false doesn't make any sense.
Also you forgot one:
Index: includes/User.php
===================================================================
--- includes/User.php (revision 35105)
+++ includes/User.php (working copy)
@@ -1944,7 +1944,7 @@
* the next change of the page if it's watched etc.
*/
function clearNotification( &$title ) {
- global $wgUser, $wgUseEnotif;
+ global $wgUser, $wgUseEnotif, $wgShowUpdatedMarker;
# Do nothing if the database is locked to writes
if( wfReadOnly() ) {
@@ -1958,7 +1958,7 @@
$this->setNewtalk( false );
}
- if( !$wgUseEnotif ) {
+ if( !$wgUseEnotif && !$wgShowUpdatedMarker ) {
return;
}
Without this the markers won't disappear when $wgEnotifUserTalk = false and
$wgEnotifWatchlist = false.
See also bug 13916 [1].
Jelte
[1]
https://bugzilla.wikimedia.org/show_bug.cgi?id=13916