Branch merge of change-tagging branch with trunk
[lhc/web/wiklou.git] / includes / PageHistory.php
index 2573b66..0441cf2 100644 (file)
@@ -3,6 +3,7 @@
  * Page history
  *
  * Split off from Article.php and Skin.php, 2003-12-22
+ * @file
  */
 
 /**
@@ -21,7 +22,6 @@ class PageHistory {
        var $mArticle, $mTitle, $mSkin;
        var $lastdate;
        var $linesonpage;
-       var $mNotificationTimestamp;
        var $mLatestId = null;
 
        /**
@@ -30,16 +30,22 @@ class PageHistory {
         * @param Article $article
         * @returns nothing
         */
-       function __construct($article) {
+       function __construct( $article ) {
                global $wgUser;
-
                $this->mArticle =& $article;
                $this->mTitle =& $article->mTitle;
-               $this->mNotificationTimestamp = NULL;
                $this->mSkin = $wgUser->getSkin();
                $this->preCacheMessages();
        }
 
+       function getArticle() {
+               return $this->mArticle;
+       }
+
+       function getTitle() {
+               return $this->mTitle;
+       }
+
        /**
         * As we use the same small set of messages in various methods and that
         * they are called often, we call them once and save them in $this->message
@@ -59,15 +65,13 @@ class PageHistory {
         * @returns nothing
         */
        function history() {
-               global $wgOut, $wgRequest, $wgTitle;
+               global $wgOut, $wgRequest, $wgTitle, $wgScript;
 
                /*
                 * Allow client caching.
                 */
-
                if( $wgOut->checkLastModified( $this->mArticle->getTouched() ) )
-                       /* Client cache fresh and headers sent, nothing more to do. */
-                       return;
+                       return; // Client cache fresh and headers sent, nothing more to do.
 
                wfProfileIn( __METHOD__ );
 
@@ -78,13 +82,14 @@ class PageHistory {
                $wgOut->setPageTitleActionText( wfMsg( 'history_short' ) );
                $wgOut->setArticleFlag( false );
                $wgOut->setArticleRelated( true );
-               $wgOut->setRobotpolicy( 'noindex,nofollow' );
+               $wgOut->setRobotPolicy( 'noindex,nofollow' );
                $wgOut->setSyndicated( true );
                $wgOut->setFeedAppendQuery( 'action=history' );
                $wgOut->addScriptFile( 'history.js' );
 
                $logPage = SpecialPage::getTitleFor( 'Log' );
-               $logLink = $this->mSkin->makeKnownLinkObj( $logPage, wfMsgHtml( 'viewpagelogs' ), 'page=' . $this->mTitle->getPrefixedUrl() );
+               $logLink = $this->mSkin->makeKnownLinkObj( $logPage, wfMsgHtml( 'viewpagelogs' ),
+                       'page=' . $this->mTitle->getPrefixedUrl() );
                $wgOut->setSubtitle( $logLink );
 
                $feedType = $wgRequest->getVal( 'feed' );
@@ -102,26 +107,31 @@ class PageHistory {
                        return;
                }
 
-               /*
-                * "go=first" means to jump to the last (earliest) history page.
-                * This is deprecated, it no longer appears in the user interface
+               /**
+                * Add date selector to quickly get to a certain time
                 */
-               if ( $wgRequest->getText("go") == 'first' ) {
-                       $limit = $wgRequest->getInt( 'limit', 50 );
-                       global $wgFeedLimit;
-                       if( $limit > $wgFeedLimit ) {
-                               $limit = $wgFeedLimit;
-                       }
-                       $wgOut->redirect( $wgTitle->getLocalURL( "action=history&limit={$limit}&dir=prev" ) );
-                       return;
-               }
+               $year = $wgRequest->getInt( 'year' );
+               $month = $wgRequest->getInt( 'month' );
+               $tagFilter = $wgRequest->getVal( 'tagfilter' );
+
+               $action = htmlspecialchars( $wgScript );
+               $wgOut->addHTML(
+                       "<form action=\"$action\" method=\"get\" id=\"mw-history-searchform\">" .
+                       Xml::fieldset( wfMsg( 'history-fieldset-title' ), false, array( 'id' => 'mw-history-search' ) ) .
+                       Xml::hidden( 'title', $this->mTitle->getPrefixedDBKey() ) . "\n" .
+                       Xml::hidden( 'action', 'history' ) . "\n" .
+                       $this->getDateMenu( $year, $month ) . '&nbsp;' .
+                       implode( '&nbsp;', ChangeTags::buildTagFilterSelector( $tagFilter ) ) . '&nbsp;' .
+                       Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .
+                       '</fieldset></form>'
+               );
 
                wfRunHooks( 'PageHistoryBeforeList', array( &$this->mArticle ) );
 
                /**
                 * Do the list
                 */
-               $pager = new PageHistoryPager( $this );
+               $pager = new PageHistoryPager( $this, $year, $month, $tagFilter );
                $this->linesonpage = $pager->getNumRows();
                $wgOut->addHTML(
                        $pager->getNavigationBar() .
@@ -130,21 +140,77 @@ class PageHistory {
                        $this->endHistoryList() .
                        $pager->getNavigationBar()
                );
+
                wfProfileOut( __METHOD__ );
        }
 
+       /**
+        * @return string Formatted HTML
+        * @param int $year
+        * @param int $month
+        */
+       private function getDateMenu( $year, $month ) {
+               # Offset overrides year/month selection
+               if( $month && $month !== -1 ) {
+                       $encMonth = intval( $month );
+               } else {
+                       $encMonth = '';
+               }
+               if( $year ) {
+                       $encYear = intval( $year );
+               } else if( $encMonth ) {
+                       $thisMonth = intval( gmdate( 'n' ) );
+                       $thisYear = intval( gmdate( 'Y' ) );
+                       if( intval($encMonth) > $thisMonth ) {
+                               $thisYear--;
+                       }
+                       $encYear = $thisYear;
+               } else {
+                       $encYear = '';
+               }
+               return Xml::label( wfMsg( 'year' ), 'year' ) . ' '.
+                       Xml::input( 'year', 4, $encYear, array('id' => 'year', 'maxlength' => 4) ) .
+                               ' '.
+                       Xml::label( wfMsg( 'month' ), 'month' ) . ' '.
+                       Xml::monthSelector( $encMonth, -1 );
+       }
+
        /**
         * Creates begin of history list with a submit button
         *
         * @return string HTML output
         */
        function beginHistoryList() {
-               global $wgTitle, $wgScript;
+               global $wgTitle, $wgScript, $wgEnableHtmlDiff;
                $this->lastdate = '';
                $s = wfMsgExt( 'histlegend', array( 'parse') );
-               $s .= Xml::openElement( 'form', array( 'action' => $wgScript ) );
+               $s .= Xml::openElement( 'form', array( 'action' => $wgScript, 'id' => 'mw-history-compare' ) );
                $s .= Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() );
-               $s .= $this->submitButton();
+               if( $wgEnableHtmlDiff ) {
+                       $s .= $this->submitButton( wfMsg( 'visualcomparison'),
+                               array(
+                                               'name' => 'htmldiff',
+                                               'class'     => 'historysubmit',
+                                               'accesskey' => wfMsg( 'accesskey-visualcomparison' ),
+                                               'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+                               )
+                       );
+                       $s .= $this->submitButton( wfMsg( 'wikicodecomparison'),
+                               array(
+                                               'class'     => 'historysubmit',
+                                               'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
+                                               'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+                               )
+                       );
+               } else {
+                       $s .= $this->submitButton( wfMsg( 'compareselectedversions'),
+                               array(
+                                               'class'     => 'historysubmit',
+                                               'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
+                                               'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+                               )
+                       );
+               }
                $s .= '<ul id="pagehistory">' . "\n";
                return $s;
        }
@@ -155,8 +221,33 @@ class PageHistory {
         * @return string HTML output
         */
        function endHistoryList() {
+               global $wgEnableHtmlDiff;
                $s = '</ul>';
-               $s .= $this->submitButton( array( 'id' => 'historysubmit' ) );
+               if( $wgEnableHtmlDiff ) {
+                       $s .= $this->submitButton( wfMsg( 'visualcomparison'),
+                               array(
+                                               'name' => 'htmldiff',
+                                               'class'     => 'historysubmit',
+                                               'accesskey' => wfMsg( 'accesskey-visualcomparison' ),
+                                               'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+                               )
+                       );
+                       $s .= $this->submitButton( wfMsg( 'wikicodecomparison'),
+                               array(
+                                               'class'     => 'historysubmit',
+                                               'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
+                                               'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+                               )
+                       );
+               } else {
+                       $s .= $this->submitButton( wfMsg( 'compareselectedversions'),
+                               array(
+                                               'class'     => 'historysubmit',
+                                               'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
+                                               'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+                               )
+                       );
+               }
                $s .= '</form>';
                return $s;
        }
@@ -164,19 +255,13 @@ class PageHistory {
        /**
         * Creates a submit button
         *
-        * @param array $bits optional CSS ID
+        * @param array $attributes attributes
         * @return string HTML output for the submit button
         */
-       function submitButton( $bits = array() ) {
+       function submitButton($message, $attributes = array() ) {
                # Disable submit button if history has 1 revision only
-               if ( $this->linesonpage > 1 ) {
-                       return Xml::submitButton( wfMsg( 'compareselectedversions' ),
-                               $bits + array(
-                                       'class'     => 'historysubmit',
-                                       'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
-                                       'title'     => wfMsg( 'tooltip-compareselectedversions' ),
-                                       )
-                               );
+               if( $this->linesonpage > 1 ) {
+                       return Xml::submitButton( $message , $attributes );
                } else {
                        return '';
                }
@@ -200,32 +285,28 @@ class PageHistory {
                $rev = new Revision( $row );
                $rev->setTitle( $this->mTitle );
 
-               $s = '';
                $curlink = $this->curLink( $rev, $latest );
                $lastlink = $this->lastLink( $rev, $next, $counter );
                $arbitrary = $this->diffButtons( $rev, $firstInList, $counter );
                $link = $this->revLink( $rev );
+               $classes = array();
 
-               $s .= "($curlink) ($lastlink) $arbitrary";
+               $s = "($curlink) ($lastlink) $arbitrary";
 
                if( $wgUser->isAllowed( 'deleterevision' ) ) {
-                       $revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
                        if( $firstInList ) {
-                       // We don't currently handle well changing the top revision's settings
-                               $del = $this->message['rev-delundel'];
+                               // We don't currently handle well changing the top revision's settings
+                               $del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.$this->message['rev-delundel'].')' );
                        } else if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
-                       // If revision was hidden from sysops
-                               $del = $this->message['rev-delundel'];
+                               // If revision was hidden from sysops
+                               $del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.$this->message['rev-delundel'].')' );
                        } else {
-                               $del = $this->mSkin->makeKnownLinkObj( $revdel,
-                                       $this->message['rev-delundel'],
-                                       'target=' . urlencode( $this->mTitle->getPrefixedDbkey() ) .
-                                       '&oldid=' . urlencode( $rev->getId() ) );
-                               // Bolden oversighted content
-                               if( $rev->isDeleted( Revision::DELETED_RESTRICTED ) )
-                                       $del = "<strong>$del</strong>";
+                               $query = array( 'target' => $this->mTitle->getPrefixedDbkey(),
+                                       'oldid' => $rev->getId()
+                               );
+                               $del = $this->mSkin->revDeleteLink( $query, $rev->isDeleted( Revision::DELETED_RESTRICTED ) );
                        }
-                       $s .= " <tt>(<small>$del</small>)</tt> ";
+                       $s .= " $del ";
                }
 
                $s .= " $link";
@@ -235,42 +316,39 @@ class PageHistory {
                        $s .= ' ' . Xml::element( 'span', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') );
                }
 
-               if ( !is_null( $size = $rev->getSize() ) && $rev->userCan( Revision::DELETED_TEXT ) ) {
-                       if ( $size == 0 )
-                               $stxt = wfMsgHtml( 'historyempty' );
-                       else
-                               $stxt = wfMsgExt( 'historysize', array( 'parsemag' ), $wgLang->formatNum( $size ) );
-                       $s .= " <span class=\"history-size\">$stxt</span>";
+               if( !is_null( $size = $rev->getSize() ) && $rev->userCan( Revision::DELETED_TEXT ) ) {
+                       $s .= ' ' . $this->mSkin->formatRevisionSize( $size );
                }
 
                $s .= $this->mSkin->revComment( $rev, false, true );
 
-               if ($notificationtimestamp && ($row->rev_timestamp >= $notificationtimestamp)) {
+               if( $notificationtimestamp && ($row->rev_timestamp >= $notificationtimestamp) ) {
                        $s .= ' <span class="updatedmarker">' .  wfMsgHtml( 'updatedmarker' ) . '</span>';
                }
-               #add blurb about text having been deleted
                if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
                        $s .= ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>';
                }
 
                $tools = array();
 
-               if ( !is_null( $next ) && is_object( $next ) ) {
-                       if( !$this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser )
-                       && !$this->mTitle->getUserPermissionsErrors( 'edit', $wgUser )
-                       && $latest ) {
-                               $tools[] = '<span class="mw-rollback-link">'
-                                       . $this->mSkin->buildRollbackLink( $rev )
-                                       . '</span>';
+               if( !is_null( $next ) && is_object( $next ) ) {
+                       if( $latest && $this->mTitle->userCan( 'rollback' ) && $this->mTitle->userCan( 'edit' ) ) {
+                               $tools[] = '<span class="mw-rollback-link">'.$this->mSkin->buildRollbackLink( $rev ).'</span>';
                        }
 
-                       if( $this->mTitle->quickUserCan( 'edit' ) &&
-                               !$rev->isDeleted( Revision::DELETED_TEXT ) &&
-                               !$next->rev_deleted & Revision::DELETED_TEXT ) {
-                               $undolink = $this->mSkin->makeKnownLinkObj(
+                       if( $this->mTitle->quickUserCan( 'edit' ) && !$rev->isDeleted( Revision::DELETED_TEXT ) &&
+                               !$next->rev_deleted & Revision::DELETED_TEXT )
+                       {
+                               # Create undo tooltip for the first (=latest) line only
+                               $undoTooltip = $latest
+                                       ? array( 'title' => wfMsg( 'tooltip-undo' ) )
+                                       : array();
+                               $undolink = $this->mSkin->link(
                                        $this->mTitle,
                                        wfMsgHtml( 'editundo' ),
-                                       'action=edit&undoafter=' . $next->rev_id . '&undo=' . $rev->getId()
+                                       $undoTooltip,
+                                       array( 'action' => 'edit', 'undoafter' => $next->rev_id, 'undo' => $rev->getId() ),
+                                       array( 'known', 'noclasses' )
                                );
                                $tools[] = "<span class=\"mw-history-undo\">{$undolink}</span>";
                        }
@@ -280,22 +358,29 @@ class PageHistory {
                        $s .= ' (' . implode( ' | ', $tools ) . ')';
                }
 
-               wfRunHooks( 'PageHistoryLineEnding', array( &$row , &$s ) );
+               # Tags
+               list($tagSummary, $newClasses) = ChangeTags::formatSummaryRow( $row->ts_tags, 'history' );
+               $classes = array_merge( $classes, $newClasses );
+               $s .= " $tagSummary";
+
+               wfRunHooks( 'PageHistoryLineEnding', array( $this, &$row , &$s ) );
 
-               return "<li>$s</li>\n";
+               $classes = implode( ' ', $classes );
+
+               return "<li class=\"$classes\">$s</li>\n";
        }
 
        /**
-       * Create a link to view this revision of the page
-       * @param Revision $rev
-       * @returns string
-       */
+        * Create a link to view this revision of the page
+        * @param Revision $rev
+        * @returns string
+        */
        function revLink( $rev ) {
                global $wgLang;
                $date = $wgLang->timeanddate( wfTimestamp(TS_MW, $rev->getTimestamp()), true );
                if( $rev->userCan( Revision::DELETED_TEXT ) ) {
                        $link = $this->mSkin->makeKnownLinkObj(
-                               $this->mTitle, $date, "oldid=" . $rev->getId() );
+                       $this->mTitle, $date, "oldid=" . $rev->getId() );
                } else {
                        $link = $date;
                }
@@ -306,30 +391,28 @@ class PageHistory {
        }
 
        /**
-       * Create a diff-to-current link for this revision for this page
-       * @param Revision $rev
-       * @param Bool $latest, this is the latest revision of the page?
-       * @returns string
-       */
+        * Create a diff-to-current link for this revision for this page
+        * @param Revision $rev
+        * @param Bool $latest, this is the latest revision of the page?
+        * @returns string
+        */
        function curLink( $rev, $latest ) {
                $cur = $this->message['cur'];
                if( $latest || !$rev->userCan( Revision::DELETED_TEXT ) ) {
                        return $cur;
                } else {
-                       return $this->mSkin->makeKnownLinkObj(
-                               $this->mTitle, $cur,
-                               'diff=' . $this->getLatestID() .
-                               "&oldid=" . $rev->getId() );
+                       return $this->mSkin->makeKnownLinkObj( $this->mTitle, $cur,
+                               'diff=' . $this->mTitle->getLatestRevID() . "&oldid=" . $rev->getId() );
                }
        }
 
        /**
-       * Create a diff-to-previous link for this revision for this page.
-       * @param Revision $prevRev, the previous revision
-       * @param mixed $next, the newer revision
-       * @param int $counter, what row on the history list this is
-       * @returns string
-       */
+        * Create a diff-to-previous link for this revision for this page.
+        * @param Revision $prevRev, the previous revision
+        * @param mixed $next, the newer revision
+        * @param int $counter, what row on the history list this is
+        * @returns string
+        */
        function lastLink( $prevRev, $next, $counter ) {
                $last = $this->message['last'];
                # $next may either be a Row, null, or "unkown"
@@ -339,21 +422,13 @@ class PageHistory {
                        return $last;
                } elseif( $next === 'unknown' ) {
                        # Next row probably exists but is unknown, use an oldid=prev link
-                       return $this->mSkin->makeKnownLinkObj(
-                               $this->mTitle,
-                               $last,
+                       return $this->mSkin->makeKnownLinkObj( $this->mTitle, $last,
                                "diff=" . $prevRev->getId() . "&oldid=prev" );
                } elseif( !$prevRev->userCan(Revision::DELETED_TEXT) || !$nextRev->userCan(Revision::DELETED_TEXT) ) {
                        return $last;
                } else {
-                       return $this->mSkin->makeKnownLinkObj(
-                               $this->mTitle,
-                               $last,
-                               "diff=" . $prevRev->getId() . "&oldid={$next->rev_id}"
-                               /*,
-                               '',
-                               '',
-                               "tabindex={$counter}"*/ );
+                       return $this->mSkin->makeKnownLinkObj( $this->mTitle, $last,
+                               "diff=" . $prevRev->getId() . "&oldid={$next->rev_id}" );
                }
        }
 
@@ -377,10 +452,10 @@ class PageHistory {
                        }
 
                        /** @todo: move title texts to javascript */
-                       if ( $firstInList ) {
+                       if( $firstInList ) {
                                $first = Xml::element( 'input', array_merge(
-                                       $radio,
-                                       array(
+                               $radio,
+                               array(
                                                'style' => 'visibility:hidden',
                                                'name'  => 'oldid' ) ) );
                                $checkmark = array( 'checked' => 'checked' );
@@ -391,34 +466,21 @@ class PageHistory {
                                        $checkmark = array();
                                }
                                $first = Xml::element( 'input', array_merge(
-                                       $radio,
-                                       $checkmark,
-                                       array( 'name'  => 'oldid' ) ) );
+                               $radio,
+                               $checkmark,
+                               array( 'name'  => 'oldid' ) ) );
                                $checkmark = array();
                        }
                        $second = Xml::element( 'input', array_merge(
-                               $radio,
-                               $checkmark,
-                               array( 'name'  => 'diff' ) ) );
+                       $radio,
+                       $checkmark,
+                       array( 'name'  => 'diff' ) ) );
                        return $first . $second;
                } else {
                        return '';
                }
        }
 
-       /** @todo document */
-       function getLatestId() {
-               if( is_null( $this->mLatestId ) ) {
-                       $id = $this->mTitle->getArticleID();
-                       $db = wfGetDB( DB_SLAVE );
-                       $this->mLatestId = $db->selectField( 'page',
-                               "page_latest",
-                               array( 'page_id' => $id ),
-                               __METHOD__ );
-               }
-               return $this->mLatestId;
-       }
-
        /**
         * Fetch an array of revisions, specified by a given limit, offset and
         * direction. This is now only used by the feeds. It was previously
@@ -427,61 +489,25 @@ class PageHistory {
        function fetchRevisions($limit, $offset, $direction) {
                $dbr = wfGetDB( DB_SLAVE );
 
-               if ($direction == PageHistory::DIR_PREV)
+               if( $direction == PageHistory::DIR_PREV )
                        list($dirs, $oper) = array("ASC", ">=");
                else /* $direction == PageHistory::DIR_NEXT */
                        list($dirs, $oper) = array("DESC", "<=");
 
-               if ($offset)
+               if( $offset )
                        $offsets = array("rev_timestamp $oper '$offset'");
                else
                        $offsets = array();
 
                $page_id = $this->mTitle->getArticleID();
 
-               $res = $dbr->select(
-                       'revision',
+               return $dbr->select( 'revision',
                        Revision::selectFields(),
                        array_merge(array("rev_page=$page_id"), $offsets),
                        __METHOD__,
-                       array('ORDER BY' => "rev_timestamp $dirs",
+                       array( 'ORDER BY' => "rev_timestamp $dirs", 
                                'USE INDEX' => 'page_timestamp', 'LIMIT' => $limit)
-                       );
-
-               $result = array();
-               while (($obj = $dbr->fetchObject($res)) != NULL)
-                       $result[] = $obj;
-
-               return $result;
-       }
-
-       /** @todo document */
-       function getNotificationTimestamp() {
-               global $wgUser, $wgShowUpdatedMarker;
-
-               if ($this->mNotificationTimestamp !== NULL)
-                       return $this->mNotificationTimestamp;
-
-               if ($wgUser->isAnon() || !$wgShowUpdatedMarker)
-                       return $this->mNotificationTimestamp = false;
-
-               $dbr = wfGetDB(DB_SLAVE);
-
-               $this->mNotificationTimestamp = $dbr->selectField(
-                       'watchlist',
-                       'wl_notificationtimestamp',
-                       array(  'wl_namespace' => $this->mTitle->getNamespace(),
-                               'wl_title' => $this->mTitle->getDBkey(),
-                               'wl_user' => $wgUser->getID()
-                       ),
-                       __METHOD__ );
-
-               // Don't use the special value reserved for telling whether the field is filled
-               if ( is_null( $this->mNotificationTimestamp ) ) {
-                       $this->mNotificationTimestamp = false;
-               }
-
-               return $this->mNotificationTimestamp;
+               );
        }
 
        /**
@@ -489,29 +515,25 @@ class PageHistory {
         * @param string $type
         */
        function feed( $type ) {
-               require_once 'SpecialRecentchanges.php';
-
-               global $wgFeed, $wgFeedClasses;
-
-               if ( !$wgFeed ) {
-                       global $wgOut;
-                       $wgOut->addWikiMsg( 'feed-unavailable' );
-                       return;
-               }
-
-               if( !isset( $wgFeedClasses[$type] ) ) {
-                       global $wgOut;
-                       $wgOut->addWikiMsg( 'feed-invalid' );
+               global $wgFeedClasses, $wgRequest, $wgFeedLimit;
+               if( !FeedUtils::checkFeedOutput($type) ) {
                        return;
                }
 
                $feed = new $wgFeedClasses[$type](
-                       $this->mTitle->getPrefixedText() . ' - ' .
-                               wfMsgForContent( 'history-feed-title' ),
-                       wfMsgForContent( 'history-feed-description' ),
-                       $this->mTitle->getFullUrl( 'action=history' ) );
+               $this->mTitle->getPrefixedText() . ' - ' .
+               wfMsgForContent( 'history-feed-title' ),
+               wfMsgForContent( 'history-feed-description' ),
+               $this->mTitle->getFullUrl( 'action=history' ) );
+
+               // Get a limit on number of feed entries. Provide a sane default
+               // of 10 if none is defined (but limit to $wgFeedLimit max)
+               $limit = $wgRequest->getInt( 'limit', 10 );
+               if( $limit > $wgFeedLimit || $limit < 1 ) {
+                       $limit = 10;
+               }
+               $items = $this->fetchRevisions($limit, 0, PageHistory::DIR_NEXT);
 
-               $items = $this->fetchRevisions(10, 0, PageHistory::DIR_NEXT);
                $feed->outHeader();
                if( $items ) {
                        foreach( $items as $row ) {
@@ -530,7 +552,7 @@ class PageHistory {
                        $wgOut->parse( wfMsgForContent( 'history-feed-empty' ) ),
                        $this->mTitle->getFullUrl(),
                        wfTimestamp( TS_MW ),
-                       '',
+                               '',
                        $this->mTitle->getTalkPage()->getFullUrl() );
        }
 
@@ -545,19 +567,19 @@ class PageHistory {
        function feedItem( $row ) {
                $rev = new Revision( $row );
                $rev->setTitle( $this->mTitle );
-               $text = rcFormatDiffRow( $this->mTitle,
-                       $this->mTitle->getPreviousRevisionID( $rev->getId() ),
-                       $rev->getId(),
-                       $rev->getTimestamp(),
-                       $rev->getComment() );
+               $text = FeedUtils::formatDiffRow( $this->mTitle,
+               $this->mTitle->getPreviousRevisionID( $rev->getId() ),
+               $rev->getId(),
+               $rev->getTimestamp(),
+               $rev->getComment() );
 
                if( $rev->getComment() == '' ) {
                        global $wgContLang;
                        $title = wfMsgForContent( 'history-feed-item-nocomment',
-                               $rev->getUserText(),
-                               $wgContLang->timeanddate( $rev->getTimestamp() ) );
+                       $rev->getUserText(),
+                       $wgContLang->timeanddate( $rev->getTimestamp() ) );
                } else {
-                       $title = $rev->getUserText() . ": " . $this->stripComment( $rev->getComment() );
+                       $title = $rev->getUserText() . wfMsgForContent( 'colon-separator' ) . FeedItem::stripComment( $rev->getComment() );
                }
 
                return new FeedItem(
@@ -568,34 +590,34 @@ class PageHistory {
                        $rev->getUserText(),
                        $this->mTitle->getTalkPage()->getFullUrl() );
        }
-
-       /**
-        * Quickie hack... strip out wikilinks to more legible form from the comment.
-        */
-       function stripComment( $text ) {
-               return preg_replace( '/\[\[([^]]*\|)?([^]]+)\]\]/', '\2', $text );
-       }
 }
 
 
 /**
- * @addtogroup Pager
+ * @ingroup Pager
  */
 class PageHistoryPager extends ReverseChronologicalPager {
-       public $mLastRow = false, $mPageHistory;
+       public $mLastRow = false, $mPageHistory, $mTitle;
 
-       function __construct( $pageHistory ) {
+       function __construct( $pageHistory, $year='', $month='', $tagFilter = '' ) {
                parent::__construct();
                $this->mPageHistory = $pageHistory;
+               $this->mTitle =& $this->mPageHistory->mTitle;
+               $this->tagFilter = $tagFilter;
+               $this->getDateCond( $year, $month );
        }
 
        function getQueryInfo() {
-               return array(
-                       'tables' => 'revision',
-                       'fields' => Revision::selectFields(),
-                       'conds' => array('rev_page' => $this->mPageHistory->mTitle->getArticleID() ),
-                       'options' => array( 'USE INDEX' => 'page_timestamp' )
+               $queryInfo = array(
+                       'tables'  => array('revision'),
+                       'fields'  => array_merge( Revision::selectFields(), array('ts_tags') ),
+                       'conds'   => array('rev_page' => $this->mPageHistory->mTitle->getArticleID() ),
+                       'options' => array( 'USE INDEX' => array('revision' => 'page_timestamp') ),
+                       'join_conds' => array( 'tag_summary' => array( 'LEFT JOIN', 'ts_rev_id=rev_id' ) ),
                );
+               ChangeTags::modifyDisplayQuery( $queryInfo['tables'], $queryInfo['fields'], $queryInfo['conds'], $queryInfo['join_conds'], $this->tagFilter );
+               wfRunHooks( 'PageHistoryPager::getQueryInfo', array( &$this, &$queryInfo ) );
+               return $queryInfo;
        }
 
        function getIndexField() {
@@ -603,11 +625,11 @@ class PageHistoryPager extends ReverseChronologicalPager {
        }
 
        function formatRow( $row ) {
-               if ( $this->mLastRow ) {
+               if( $this->mLastRow ) {
                        $latest = $this->mCounter == 1 && $this->mIsFirst;
                        $firstInList = $this->mCounter == 1;
                        $s = $this->mPageHistory->historyLine( $this->mLastRow, $row, $this->mCounter++,
-                               $this->mPageHistory->getNotificationTimestamp(), $latest, $firstInList );
+                               $this->mTitle->getNotificationTimestamp(), $latest, $firstInList );
                } else {
                        $s = '';
                }
@@ -622,12 +644,12 @@ class PageHistoryPager extends ReverseChronologicalPager {
        }
 
        function getEndBody() {
-               if ( $this->mLastRow ) {
+               if( $this->mLastRow ) {
                        $latest = $this->mCounter == 1 && $this->mIsFirst;
                        $firstInList = $this->mCounter == 1;
-                       if ( $this->mIsBackwards ) {
+                       if( $this->mIsBackwards ) {
                                # Next row is unknown, but for UI reasons, probably exists if an offset has been specified
-                               if ( $this->mOffset == '' ) {
+                               if( $this->mOffset == '' ) {
                                        $next = null;
                                } else {
                                        $next = 'unknown';
@@ -637,7 +659,7 @@ class PageHistoryPager extends ReverseChronologicalPager {
                                $next = $this->mPastTheEndRow;
                        }
                        $s = $this->mPageHistory->historyLine( $this->mLastRow, $next, $this->mCounter++,
-                               $this->mPageHistory->getNotificationTimestamp(), $latest, $firstInList );
+                               $this->mTitle->getNotificationTimestamp(), $latest, $firstInList );
                } else {
                        $s = '';
                }