MediaWiki 1.17.0

[autoinstallsdev/mediawiki.git] / includes / ChangesFeed.php

diff --git a/includes/ChangesFeed.php b/includes/ChangesFeed.php
index f3c3e4294f52d428355cff03f7192610c4fa830f..f07b6505c49c3772aef4b71bc5fad248d0a97529 100644 (file)
--- a/includes/ChangesFeed.php
+++ b/includes/ChangesFeed.php
@@ -1,35 +1,61 @@
 <?php
 
+/**
+ * Feed to Special:RecentChanges and Special:RecentChangesLiked
+ *
+ * @ingroup Feed
+ */
 class ChangesFeed {
-
        public $format, $type, $titleMsg, $descMsg;
 
+       /**
+        * Constructor
+        *
+        * @param $format String: feed's format (either 'rss' or 'atom')
+        * @param $type String: type of feed (for cache keys)
+        */
        public function __construct( $format, $type ) {
                $this->format = $format;
                $this->type = $type;
        }
 
+       /**
+        * Get a ChannelFeed subclass object to use
+        *
+        * @param $title String: feed's title
+        * @param $description String: feed's description
+        * @return ChannelFeed subclass or false on failure
+        */
        public function getFeedObject( $title, $description ) {
-               global $wgSitename, $wgContLanguageCode, $wgFeedClasses, $wgTitle;
-               $feedTitle = "$wgSitename  - {$title} [$wgContLanguageCode]";
+               global $wgSitename, $wgLanguageCode, $wgFeedClasses, $wgTitle;
+               $feedTitle = "$wgSitename  - {$title} [$wgLanguageCode]";
                if( !isset($wgFeedClasses[$this->format] ) )
                        return false;
                return new $wgFeedClasses[$this->format](
                        $feedTitle, htmlspecialchars( $description ), $wgTitle->getFullUrl() );
        }
 
-       public function execute( $feed, $rows, $limit = 0 , $hideminor = false, $lastmod = false ) {
-               global $messageMemc, $wgFeedCacheTimeout;
-               global $wgFeedClasses, $wgSitename, $wgContLanguageCode;
+       /**
+        * Generates feed's content
+        *
+        * @param $feed ChannelFeed subclass object (generally the one returned by getFeedObject())
+        * @param $rows ResultWrapper object with rows in recentchanges table
+        * @param $lastmod Integer: timestamp of the last item in the recentchanges table (only used for the cache key)
+        * @param $opts FormOptions as in SpecialRecentChanges::getDefaultOptions()
+        * @return null or true
+        */
+       public function execute( $feed, $rows, $lastmod, $opts ) {
+               global $wgLang, $wgRenderHashAppend;
 
                if ( !FeedUtils::checkFeedOutput( $this->format ) ) {
                        return;
                }
 
-               $timekey = wfMemcKey( $this->type, $this->format, 'timestamp' );
-               $key = wfMemcKey( $this->type, $this->format, 'limit', $limit, 'minor', $hideminor );
+               $optionsHash = md5( serialize( $opts->getAllValues() ) ) . $wgRenderHashAppend;
+               $timekey = wfMemcKey( $this->type, $this->format, $wgLang->getCode(), $optionsHash, 'timestamp' );
+               $key = wfMemcKey( $this->type, $this->format, $wgLang->getCode(), $optionsHash );
 
-               FeedUtils::checkPurge($timekey, $key);
+               FeedUtils::checkPurge( $timekey, $key );
 
                /*
                * Bumping around loading up diffs can be pretty slow, so where
@@ -52,15 +78,31 @@ class ChangesFeed {
                return true;
        }
 
+       /**
+        * Save to feed result to $messageMemc
+        *
+        * @param $feed String: feed's content
+        * @param $timekey String: memcached key of the last modification
+        * @param $key String: memcached key of the content
+        */
        public function saveToCache( $feed, $timekey, $key ) {
                global $messageMemc;
                $expire = 3600 * 24; # One day
-               $messageMemc->set( $key, $feed );
+               $messageMemc->set( $key, $feed, $expire );
                $messageMemc->set( $timekey, wfTimestamp( TS_MW ), $expire );
        }
 
+       /**
+        * Try to load the feed result from $messageMemc
+        *
+        * @param $lastmod Integer: timestamp of the last item in the recentchanges table
+        * @param $timekey String: memcached key of the last modification
+        * @param $key String: memcached key of the content
+        * @return feed's content on cache hit or false on cache miss
+        */
        public function loadFromCache( $lastmod, $timekey, $key ) {
-               global $wgFeedCacheTimeout, $messageMemc;
+               global $wgFeedCacheTimeout, $wgOut, $messageMemc;
+
                $feedLastmod = $messageMemc->get( $timekey );
 
                if( ( $wgFeedCacheTimeout > 0 ) && $feedLastmod ) {
@@ -77,6 +119,9 @@ class ChangesFeed {
 
                        if( $feedAge < $wgFeedCacheTimeout || $feedLastmodUnix > $lastmodUnix) {
                                wfDebug( "RC: loading feed from cache ($key; $feedLastmod; $lastmod)...\n" );
+                               if ( $feedLastmodUnix < $lastmodUnix ) {
+                                       $wgOut->setLastModified( $feedLastmod ); // bug 21916
+                               }
                                return $messageMemc->get( $key );
                        } else {
                                wfDebug( "RC: cached feed timestamp check failed ($feedLastmod; $lastmod)\n" );
@@ -86,10 +131,10 @@ class ChangesFeed {
        }
 
        /**
-       * Generate the feed items given a row from the database.
-       * @param $rows Database resource with recentchanges rows
-       * @param $feed Feed object
-       */
+        * Generate the feed items given a row from the database.
+        * @param $rows DatabaseBase resource with recentchanges rows
+        * @param $feed Feed object
+        */
        public static function generateFeed( $rows, &$feed ) {
                wfProfileIn( __METHOD__ );
 
@@ -113,18 +158,20 @@ class ChangesFeed {
                foreach( $sorted as $obj ) {
                        $title = Title::makeTitle( $obj->rc_namespace, $obj->rc_title );
                        $talkpage = $title->getTalkPage();
+                       // Skip items with deleted content (avoids partially complete/inconsistent output)
+                       if( $obj->rc_deleted ) continue;
                        $item = new FeedItem(
                                $title->getPrefixedText(),
                                FeedUtils::formatDiff( $obj ),
-                               $title->getFullURL( 'diff=' . $obj->rc_this_oldid . '&oldid=prev' ),
+                               $obj->rc_this_oldid ? $title->getFullURL( 'diff=' . $obj->rc_this_oldid . '&oldid=prev' ) : $title->getFullURL(),
                                $obj->rc_timestamp,
                                ($obj->rc_deleted & Revision::DELETED_USER) ? wfMsgHtml('rev-deleted-user') : $obj->rc_user_text,
                                $talkpage->getFullURL()
-                               );
+                       );
                        $feed->outItem( $item );
                }
                $feed->outFooter();
                wfProfileOut( __METHOD__ );
        }
 
-}
\ No newline at end of file
+}