(bug 25832) query=allimages now outputs ns/title as well

[lhc/web/wiklou.git] / includes / api / ApiFeedWatchlist.php

diff --git a/includes/api/ApiFeedWatchlist.php b/includes/api/ApiFeedWatchlist.php
index 3cde8db..1d6b22c 100644 (file)
--- a/includes/api/ApiFeedWatchlist.php
+++ b/includes/api/ApiFeedWatchlist.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * API for MediaWiki 1.8+
+ *
  *
  * Created on Oct 13, 2006
  *
@@ -49,6 +49,8 @@ class ApiFeedWatchlist extends ApiBase {
                return new ApiFormatFeedWrapper( $this->getMain() );
        }
 
+       private $linkToDiffs = false;
+
        /**
         * Make a nested call to the API to request watchlist items in the last $hours.
         * Wrap the result as an RSS/Atom feed.
@@ -70,7 +72,7 @@ class ApiFeedWatchlist extends ApiBase {
                                'list' => 'watchlist',
                                'wlprop' => 'title|user|comment|timestamp',
                                'wldir' => 'older', // reverse order - from newest to oldest
-                               'wlend' => wfTimestamp( TS_MW, $endTime ),      // stop at this time
+                               'wlend' => $endTime, // stop at this time
                                'wllimit' => ( 50 > $wgFeedLimit ) ? $wgFeedLimit : 50
                        );
 
@@ -81,6 +83,12 @@ class ApiFeedWatchlist extends ApiBase {
                                $fauxReqArr['wltoken'] = $params['wltoken'];
                        }
 
+                       // Support linking to diffs instead of article
+                       if ( $params['linktodiffs'] ) {
+                               $this->linkToDiffs = true;
+                               $fauxReqArr['wlprop'] .= '|ids';
+                       }
+
                        // Check for 'allrev' parameter, and if found, show all revisions to each page on wl.
                        if ( !is_null( $params['allrev'] ) ) {
                                $fauxReqArr['wlallrev'] = '';
@@ -135,7 +143,11 @@ class ApiFeedWatchlist extends ApiBase {
        private function createFeedItem( $info ) {
                $titleStr = $info['title'];
                $title = Title::newFromText( $titleStr );
-               $titleUrl = $title->getFullURL();
+               if ( $this->linkToDiffs && isset( $info['revid'] ) ) {
+                       $titleUrl = $title->getFullURL( array( 'diff' => $info['revid'] ) );
+               } else {
+                       $titleUrl = $title->getFullURL();
+               }
                $comment = isset( $info['comment'] ) ? $info['comment'] : null;
                $timestamp = $info['timestamp'];
                $user = $info['user'];
@@ -165,7 +177,8 @@ class ApiFeedWatchlist extends ApiBase {
                        ),
                        'wltoken' => array(
                                ApiBase::PARAM_TYPE => 'string'
-                       )
+                       ),
+                       'linktodiffs' => false,
                );
        }
 
@@ -174,8 +187,9 @@ class ApiFeedWatchlist extends ApiBase {
                        'feedformat' => 'The format of the feed',
                        'hours'      => 'List pages modified within this many hours from now',
                        'allrev'     => 'Include multiple revisions of the same page within given timeframe',
-                       'wlowner'     => "The user whose watchlist you want (must be accompanied by {$this->getModulePrefix()}token if it's not you)",
-                       'wltoken'    => 'Security token that requested user set in their preferences'
+                       'wlowner'    => "The user whose watchlist you want (must be accompanied by {$this->getModulePrefix()}token if it's not you)",
+                       'wltoken'    => 'Security token that requested user set in their preferences',
+                       'linktodiffs' => 'Link to change differences instead of article pages'
                );
        }
 
@@ -185,7 +199,8 @@ class ApiFeedWatchlist extends ApiBase {
 
        protected function getExamples() {
                return array(
-                       'api.php?action=feedwatchlist'
+                       'api.php?action=feedwatchlist',
+                       'api.php?action=feedwatchlist&allrev=allrev&linktodiffs=&hours=6'
                );
        }