| Index: trunk/phase3/includes/User.php |
| — | — | @@ -2520,7 +2520,7 @@ |
| 2521 | 2521 | * @param $title Title of the article to look at |
| 2522 | 2522 | */ |
| 2523 | 2523 | function clearNotification( &$title ) { |
| 2524 | | - global $wgUser, $wgUseEnotif, $wgShowUpdatedMarker; |
| | 2524 | + global $wgUseEnotif, $wgShowUpdatedMarker; |
| 2525 | 2525 | |
| 2526 | 2526 | # Do nothing if the database is locked to writes |
| 2527 | 2527 | if( wfReadOnly() ) { |
| — | — | @@ -2548,13 +2548,11 @@ |
| 2549 | 2549 | // and when it does have to be executed, it can be on a slave |
| 2550 | 2550 | // If this is the user's newtalk page, we always update the timestamp |
| 2551 | 2551 | if( $title->getNamespace() == NS_USER_TALK && |
| 2552 | | - $title->getText() == $wgUser->getName() ) |
| | 2552 | + $title->getText() == $this->getName() ) |
| 2553 | 2553 | { |
| 2554 | 2554 | $watched = true; |
| 2555 | | - } elseif ( $this->getId() == $wgUser->getId() ) { |
| 2556 | | - $watched = $title->userIsWatching(); |
| 2557 | 2555 | } else { |
| 2558 | | - $watched = true; |
| | 2556 | + $watched = $this->isWatched( $title ); |
| 2559 | 2557 | } |
| 2560 | 2558 | |
| 2561 | 2559 | // If the page is watched by the user (or may be watched), update the timestamp on any |