* (bug 1370) e-notif correction

diff --git a/includes/Article.php b/includes/Article.php
index 0c14bd8..3f995d4 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -731,8 +731,6 @@ class Article {
 
                $this->viewUpdates();
                wfProfileOut( $fname );
-
-               $wgUser->clearNotification( $this->mTitle );
        }
 
        /**
@@ -1852,7 +1850,10 @@ class Article {
                        $this->mTitle->getText() == $wgUser->getName()) {
                        require_once( 'UserTalkUpdate.php' );
                        $u = new UserTalkUpdate( 0, $this->mTitle->getNamespace(), $this->mTitle->getDBkey(), false, false, false );
+               } else {
+                       $wgUser->clearNotification( $this->mTitle );
                }
+
        }
 
        /**

diff --git a/includes/User.php b/includes/User.php
index e5aa81f..110a9f5 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -863,7 +863,7 @@ class User {
                $dbw =& wfGetDB( DB_MASTER );
                $success = $dbw->update( 'watchlist',
                                array( /* SET */
-                                       'wl_notificationtimestamp' => $dbw->timestamp(0)
+                                       'wl_notificationtimestamp' => 0
                                ), array( /* WHERE */
                                        'wl_title' => $title->getDBkey(),
                                        'wl_namespace' => $title->getNamespace(),