(bug 4610) Indicate patrolled status on watchlists and allow users to mark changes...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8ba8452..6eec82c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -318,8 +318,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6055) Fix for HTML/JS injection bug in variable handler (found by Nick Jenkins)
 * Reordered wiki table handling and __TOC__ extraction in the parser to better
   handle some overlapping tag cases.
-* Only the first __TOC__ is now turned into a TOC.
-
+* Only the first __TOC__ is now turned into a TOC
+* (bug 4610) Indicate patrolled status on watchlists and allow users to mark
+  changes as patrolled using the diff links there
 
 == Compatibility ==
 

diff --git a/includes/RecentChange.php b/includes/RecentChange.php
index 659e688..cae6d76 100644 (file)
--- a/includes/RecentChange.php
+++ b/includes/RecentChange.php
@@ -411,8 +411,8 @@ class RecentChange
                        'rc_moved_to_ns'        => 0,
                        'rc_moved_to_title'     => '',
                        'rc_ip' => '',
-                       'rc_patrolled' => '1',  # we can't support patrolling on the Watchlist
-                                               # currently because it uses cur, not recentchanges
+                       'rc_id' => $row->rc_id,
+                       'rc_patrolled' => $row->rc_patrolled,
                        'rc_new' => $row->page_is_new # obsolete
                );
 

diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index dc9602b..c8e70a8 100644 (file)
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -292,7 +292,7 @@ function wfSpecialWatchlist( $par ) {
          rc_user AS rev_user, rc_user_text AS rev_user_text,
          rc_timestamp AS rev_timestamp, rc_minor AS rev_minor_edit,
          rc_this_oldid AS rev_id,
-         rc_last_oldid,
+         rc_last_oldid, rc_id, rc_patrolled,
          rc_new AS page_is_new,wl_notificationtimestamp
          FROM $watchlist,$recentchanges,$page
          WHERE wl_user=$uid