From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 15 Mar 2005 07:27:48 +0000 (+0000)
Subject: * (bug 1370) e-notif correction
X-Git-Tag: 1.5.0alpha1~603
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/journal.php?a=commitdiff_plain;h=1bfd766b2d6366bf19815b04712753bdac811908;p=lhc%2Fweb%2Fwiklou.git

* (bug 1370) e-notif correction
---

diff --git a/includes/Article.php b/includes/Article.php
index 0c14bd8e30..3f995d448a 100644
--- 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 e5aa81fd3f..110a9f55a0 100644
--- 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(),