(bug 28070) Fix watchlist RSS for databases that store timestamps in a real timestamp...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 482654e..64dffcb 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -283,6 +283,8 @@ PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 27586) Remove duplication of props in ApiQueryStashImageInfo
   by using ApiQueryImageInfo
 * (bug 28226) prop=extlinks&eloffset should be an integer
+* (bug 28070) Fix watchlist RSS for databases that store timestamps in a 
+  real timestamp field.
   
 === Languages updated in 1.18 ===
 

diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php
index 0cc53a3..17e8e0c 100644 (file)
--- a/includes/api/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -128,8 +128,12 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
                        'wl_user' => $userId,
                        'rc_deleted' => 0,
                ) );
+               
+               $db = $this->getDB();
 
-               $this->addWhereRange( 'rc_timestamp', $params['dir'], $params['start'], $params['end'] );
+               $this->addWhereRange( 'rc_timestamp', $params['dir'], 
+                       $db->timestamp( $params['start'] ), 
+                       $db->timestamp( $params['end'] ) );
                $this->addWhereFld( 'wl_namespace', $params['namespace'] );
                $this->addWhereIf( 'rc_this_oldid=page_latest', !$params['allrev'] );
 
@@ -175,7 +179,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
                        $this->addWhere( 'rc_user_text != ' . $this->getDB()->addQuotes( $params['excludeuser'] ) );
                }
 
-               $db = $this->getDB();
+               
 
                // This is an index optimization for mysql, as done in the Special:Watchlist page
                $this->addWhereIf( "rc_timestamp > ''", !isset( $params['start'] ) && !isset( $params['end'] ) && $db->getType() == 'mysql' );