Tweak for r29561: don't grab a database object until we need it
[lhc/web/wiklou.git] / includes / PageHistory.php
index f06bf62..9d84665 100644 (file)
@@ -3,15 +3,8 @@
  * Page history
  *
  * Split off from Article.php and Skin.php, 2003-12-22
- * @package MediaWiki
  */
 
-/** */
-include_once ( 'SpecialValidate.php' );
-
-define('DIR_PREV', 0);
-define('DIR_NEXT', 1);
-
 /**
  * This class handles printing the history page for an article.  In order to
  * be efficient, it uses timestamps rather than offsets for paging, to avoid
@@ -20,14 +13,16 @@ define('DIR_NEXT', 1);
  * Construct it by passing in an Article, and call $h->history() to print the
  * history.
  *
- * @package MediaWiki
  */
-
 class PageHistory {
+       const DIR_PREV = 0;
+       const DIR_NEXT = 1;
+       
        var $mArticle, $mTitle, $mSkin;
        var $lastdate;
        var $linesonpage;
        var $mNotificationTimestamp;
+       var $mLatestId = null;
 
        /**
         * Construct a new PageHistory.
@@ -35,15 +30,13 @@ class PageHistory {
         * @param Article $article
         * @returns nothing
         */
-       function PageHistory($article) {
+       function __construct($article) {
                global $wgUser;
 
                $this->mArticle =& $article;
                $this->mTitle =& $article->mTitle;
                $this->mNotificationTimestamp = NULL;
                $this->mSkin = $wgUser->getSkin();
-
-               $this->defaultLimit = 50;
        }
 
        /**
@@ -52,8 +45,7 @@ class PageHistory {
         * @returns nothing
         */
        function history() {
-               global $wgUser, $wgOut, $wgLang, $wgShowUpdatedMarker, $wgRequest,
-                       $wgTitle, $wgUseValidation;
+               global $wgOut, $wgRequest, $wgTitle;
 
                /*
                 * Allow client caching.
@@ -69,11 +61,22 @@ class PageHistory {
                /*
                 * Setup page variables.
                 */
-               $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-               $wgOut->setSubtitle( wfMsg( 'revhistory' ) );
+               $wgOut->setPageTitle( wfMsg( 'history-title', $this->mTitle->getPrefixedText() ) );
+               $wgOut->setPageTitleActionText( wfMsg( 'history_short' ) );
                $wgOut->setArticleFlag( false );
                $wgOut->setArticleRelated( true );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
+               $wgOut->setSyndicated( true );
+
+               $logPage = SpecialPage::getTitleFor( 'Log' );
+               $logLink = $this->mSkin->makeKnownLinkObj( $logPage, wfMsgHtml( 'viewpagelogs' ), 'page=' . $this->mTitle->getPrefixedUrl() );
+               $wgOut->setSubtitle( $logLink );
+
+               $feedType = $wgRequest->getVal( 'feed' );
+               if( $feedType ) {
+                       wfProfileOut( $fname );
+                       return $this->feed( $feedType );
+               }
 
                /*
                 * Fail if article doesn't exist.
@@ -84,220 +87,255 @@ class PageHistory {
                        return;
                }
 
-               $dbr =& wfGetDB(DB_SLAVE);
-
-               /*
-                * Extract limit, the number of revisions to show, and
-                * offset, the timestamp to begin at, from the URL.
-                */
-               $limit = $wgRequest->getInt('limit', $this->defaultLimit);
-               $offset = $wgRequest->getText('offset');
-
-               /* Offset must be an integral. */
-               if (!strlen($offset) || !preg_match("/^[0-9]+$/", $offset))
-                       $offset = 0;
-#              $offset = $dbr->timestamp($offset);
-               $dboffset = $offset === 0 ? 0 : $dbr->timestamp($offset);
-               wfdebug("offset=[$offset] dboffset=[$dboffset]\n");
-               /*
-                * "go=last" means to jump to the last history page.
-                */
-               if (($gowhere = $wgRequest->getText("go")) !== NULL) {
-                       switch ($gowhere) {
-                       case "first":
-                               if (($lastid = $this->getLastOffsetForPaging($this->mTitle->getArticleID(), $limit)) === NULL)
-                                       break;
-                               $gourl = $wgTitle->getLocalURL("action=history&limit={$limit}&offset=".
-                                               wfTimestamp(TS_MW, $lastid));
-                               break;
-                       default:
-                               $gourl = NULL;
-                       }
-
-                       if (!is_null($gourl)) {
-                               $wgOut->redirect($gourl);
-                               return;
-                       }
-               }
-
-               /*
-                * Fetch revisions.
-                *
-                * If the user clicked "previous", we retrieve the revisions backwards,
-                * then reverse them.  This is to avoid needing to know the timestamp of
-                * previous revisions when generating the URL.
-                */
-               $direction = $this->getDirection();
-               $revisions = $this->fetchRevisions($limit, $dboffset, $direction);
-               $navbar = $this->makeNavbar($revisions, $offset, $limit, $direction);
-
                /*
-                * We fetch one more revision than needed to get the timestamp of the
-                * one after this page (and to know if it exists).
-                *
-                * linesonpage stores the actual number of lines.
+                * "go=first" means to jump to the last (earliest) history page.
+                * This is deprecated, it no longer appears in the user interface
                 */
-               if (count($revisions) < $limit + 1)
-                       $this->linesonpage = count($revisions);
-               else
-                       $this->linesonpage = count($revisions) - 1;
-
-               /* Un-reverse revisions */
-               if ($direction == DIR_PREV)
-                       $revisions = array_reverse($revisions);
-
-               /*
-                * Print the top navbar.
-                */
-               $s = $navbar;
-               $s .= $this->beginHistoryList();
-               $counter = 1;
-
-               /*
-                * Print each revision, excluding the one-past-the-end, if any.
-                */
-               foreach (array_slice($revisions, 0, $limit) as $i => $line) {
-                       $latest = !$i && $offset == 0;
-                       $firstInList = !$i;
-                       $next = isset( $revisions[$i + 1] ) ? $revisions[$i + 1 ] : null;
-                       $s .= $this->historyLine($line, $next, $counter, $this->getNotificationTimestamp(), $latest, $firstInList);
-                       $counter++;
+               if ( $wgRequest->getText("go") == 'first' ) {
+                       $limit = $wgRequest->getInt( 'limit', 50 );
+                       $wgOut->redirect( $wgTitle->getLocalURL( "action=history&limit={$limit}&dir=prev" ) );
+                       return;
                }
 
-               /*
-                * End navbar.
-               */
-               $s .= $this->endHistoryList();
-               $s .= $navbar;
+               wfRunHooks( 'PageHistoryBeforeList', array( &$this->mArticle ) );
 
-               /*
-                * Article validation line.
+               /*
+                * Do the list
                 */
-               if ($wgUseValidation)
-                       $s .= '<p>' . Validation::getStatisticsLink( $this->mArticle ) . '</p>' ;
-
-               $wgOut->addHTML( $s );
+               $pager = new PageHistoryPager( $this );
+               $this->linesonpage = $pager->getNumRows();
+               $wgOut->addHTML(
+                       $pager->getNavigationBar() . 
+                       $this->beginHistoryList() . 
+                       $pager->getBody() .
+                       $this->endHistoryList() .
+                       $pager->getNavigationBar()
+               );
                wfProfileOut( $fname );
        }
 
-       /** @todo document */
+       /**
+        * Creates begin of history list with a submit button
+        *
+        * @return string HTML output
+        */
        function beginHistoryList() {
                global $wgTitle;
                $this->lastdate = '';
-               $s = wfMsgWikiHtml( 'histlegend' );
+               $s = wfMsgExt( 'histlegend', array( 'parse') );
                $s .= '<form action="' . $wgTitle->escapeLocalURL( '-' ) . '" method="get">';
                $prefixedkey = htmlspecialchars($wgTitle->getPrefixedDbKey());
-               $s .= "<input type='hidden' name='title' value='{$prefixedkey}' />\n";
+
+               // The following line is SUPPOSED to have double-quotes around the
+               // $prefixedkey variable, because htmlspecialchars() doesn't escape
+               // single-quotes.
+               //
+               // On at least two occasions people have changed it to single-quotes,
+               // which creates invalid HTML and incorrect display of the resulting
+               // link.
+               //
+               // Please do not break this a third time. Thank you for your kind
+               // consideration and cooperation.
+               //
+               $s .= "<input type='hidden' name='title' value=\"{$prefixedkey}\" />\n";
+
                $s .= $this->submitButton();
                $s .= '<ul id="pagehistory">' . "\n";
                return $s;
        }
 
-       /** @todo document */
+       /**
+        * Creates end of history list with a submit button
+        *
+        * @return string HTML output
+        */
        function endHistoryList() {
-               $last = wfMsg( 'last' );
-
                $s = '</ul>';
                $s .= $this->submitButton( array( 'id' => 'historysubmit' ) );
                $s .= '</form>';
                return $s;
        }
 
-       /** @todo document */
+       /**
+        * Creates a submit button
+        *
+        * @param array $bits optional CSS ID
+        * @return string HTML output for the submit button
+        */
        function submitButton( $bits = array() ) {
-               return ( $this->linesonpage > 0 )
-                       ? wfElement( 'input', array_merge( $bits,
-                               array(
+               # Disable submit button if history has 1 revision only
+               if ( $this->linesonpage > 1 ) {
+                       return Xml::submitButton( wfMsg( 'compareselectedversions' ),
+                               $bits + array(
                                        'class'     => 'historysubmit',
-                                       'type'      => 'submit',
-                                       'accesskey' => wfMsgHtml( 'accesskey-compareselectedversions' ),
-                                       'title'     => wfMsgHtml( 'tooltip-compareselectedversions' ),
-                                       'value'     => wfMsgHtml( 'compareselectedversions' ),
-                               ) ) )
-                       : '';
+                                       'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
+                                       'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+                                       )
+                               );
+               } else {
+                       return '';
+               }
        }
 
-       /** @todo document */
+       /**
+        * Returns a row from the history printout.
+        *
+        * @todo document some more, and maybe clean up the code (some params redundant?)
+        *
+        * @param object $row The database row corresponding to the line (or is it the previous line?).
+        * @param object $next The database row corresponding to the next line (or is it this one?).
+        * @param int $counter Apparently a counter of what row number we're at, counted from the top row = 1.
+        * @param $notificationtimestamp
+        * @param bool $latest Whether this row corresponds to the page's latest revision.
+        * @param bool $firstInList Whether this row corresponds to the first displayed on this history page.
+        * @return string HTML output for the row
+        */
        function historyLine( $row, $next, $counter = '', $notificationtimestamp = false, $latest = false, $firstInList = false ) {
-               global $wgLang, $wgContLang;
-
-               if ( 0 == $row->rev_user ) {
-                       $contribsPage =& Title::makeTitle( NS_SPECIAL, 'Contributions' );
-                       $ul = $this->mSkin->makeKnownLinkObj( $contribsPage,
-                               htmlspecialchars( $row->rev_user_text ),
-                               'target=' . urlencode( $row->rev_user_text ) );
-               } else {
-                       $userPage =& Title::makeTitle( NS_USER, $row->rev_user_text );
-                       $ul = $this->mSkin->makeLinkObj( $userPage , htmlspecialchars( $row->rev_user_text ) );
-               }
+               global $wgUser, $wgLang;
+               $rev = new Revision( $row );
+               $rev->setTitle( $this->mTitle );
 
                $s = '<li>';
-               /* This feature is not yet used according to schema */
-               if( $row->rev_deleted ) {
-                       $s .= '<span class="history-deleted">';
+               $curlink = $this->curLink( $rev, $latest );
+               $lastlink = $this->lastLink( $rev, $next, $counter );
+               $arbitrary = $this->diffButtons( $rev, $firstInList, $counter );
+               $link = $this->revLink( $rev );
+               
+               $user = $this->mSkin->userLink( $rev->getUser(), $rev->getUserText() )
+                               . $this->mSkin->userToolLinks( $rev->getUser(), $rev->getUserText() );
+               
+               $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 = wfMsgHtml( 'rev-delundel' );
+                       } else if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
+                       // If revision was hidden from sysops
+                               $del = wfMsgHtml( 'rev-delundel' );                     
+                       } else {
+                               $del = $this->mSkin->makeKnownLinkObj( $revdel,
+                                       wfMsg( 'rev-delundel' ),
+                                       'target=' . urlencode( $this->mTitle->getPrefixedDbkey() ) .
+                                       '&oldid=' . urlencode( $rev->getId() ) );
+                       }
+                       $s .= " (<small>$del</small>) ";
                }
-               $curlink = $this->curLink( $row, $latest );
-               $lastlink = $this->lastLink( $row, $next, $counter );
-               $arbitrary = $this->diffButtons( $row, $firstInList, $counter );
-               $link = $this->revLink( $row );
-
-               $s .= "($curlink) ($lastlink) $arbitrary $link <span class='history-user'>$ul</span>";
+               
+               $s .= " $link";
+               #getUser is safe, but this avoids making the invalid untargeted contribs links
+               if( $row->rev_deleted & Revision::DELETED_USER ) {
+                       $user = '<span class="history-deleted">' . wfMsg('rev-deleted-user') . '</span>';
+               }
+               $s .= " <span class='history-user'>$user</span>";
 
                if( $row->rev_minor_edit ) {
-                       $s .= ' ' . wfElement( 'span', array( 'class' => 'minor' ), wfMsgHtml( 'minoreditletter') );
+                       $s .= ' ' . wfElement( 'span', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') );
+               }
+
+               if ( !is_null( $size = $rev->getSize() ) ) {
+                       if ( $size == 0 )
+                               $stxt = wfMsgHtml( 'historyempty' );
+                       else
+                               $stxt = wfMsgExt( 'historysize', array( 'parsemag' ), $wgLang->formatNum( $size ) );
+                       $s .= " <span class=\"history-size\">$stxt</span>";
                }
 
-               $s .= $this->mSkin->commentBlock( $row->rev_comment, $this->mTitle );
+               #getComment is safe, but this is better formatted
+               if( $rev->isDeleted( Revision::DELETED_COMMENT ) ) {
+                       $s .= " <span class=\"history-deleted\"><span class=\"comment\">" .
+                       wfMsgHtml( 'rev-deleted-comment' ) . "</span></span>";
+               } else {
+                       $s .= $this->mSkin->revComment( $rev );
+               }
+               
                if ($notificationtimestamp && ($row->rev_timestamp >= $notificationtimestamp)) {
                        $s .= ' <span class="updatedmarker">' .  wfMsgHtml( 'updatedmarker' ) . '</span>';
                }
-               if( $row->rev_deleted ) {
-                       $s .= '</span> ' . wfMsgHtml( 'deletedrev' );
+               #add blurb about text having been deleted
+               if( $row->rev_deleted & Revision::DELETED_TEXT ) {
+                       $s .= ' ' . wfMsgHtml( 'deletedrev' );
+               }
+               
+               $tools = array();
+               
+               if ( !is_null( $next ) && is_object( $next ) ) {
+                       if( $wgUser->isAllowed( 'rollback' ) && $latest ) {
+                               $tools[] = '<span class="mw-rollback-link">'
+                                       . $this->mSkin->buildRollbackLink( $rev )
+                                       . '</span>';
+                       }
+
+                       if( $this->mTitle->quickUserCan( 'edit' ) ) {
+                               $undolink = $this->mSkin->makeKnownLinkObj(
+                                       $this->mTitle,
+                                       wfMsgHtml( 'editundo' ),
+                                       'action=edit&undoafter=' . $next->rev_id . '&undo=' . $rev->getId()
+                               );
+                               $tools[] = "<span class=\"mw-history-undo\">{$undolink}</span>";
+                       }
+               }
+               
+               if( $tools ) {
+                       $s .= ' (' . implode( ' | ', $tools ) . ')';
                }
+               
+               wfRunHooks( 'PageHistoryLineEnding', array( &$row , &$s ) );
+               
                $s .= "</li>\n";
 
                return $s;
        }
-
+       
        /** @todo document */
-       function revLink( $row ) {
-               global $wgUser, $wgLang;
-               $date = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->rev_timestamp), true );
-               if( $row->rev_deleted && !$wgUser->isAllowed( 'undelete' ) ) {
-                       return $date;
+       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() );
                } else {
-                       return $this->mSkin->makeKnownLinkObj(
-                               $this->mTitle, $date, "oldid={$row->rev_id}" );
+                       $link = $date;
                }
+               if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+                       return '<span class="history-deleted">' . $link . '</span>';
+               }
+               return $link;
        }
 
        /** @todo document */
-       function curLink( $row, $latest ) {
-               global $wgUser;
-               $cur = wfMsgHtml( 'cur' );
-               if( $latest
-                       || ( $row->rev_deleted && !$wgUser->isAllowed( 'undelete' ) ) ) {
+       function curLink( $rev, $latest ) {
+               $cur = wfMsgExt( 'cur', array( 'escape') );
+               if( $latest || !$rev->userCan( Revision::DELETED_TEXT ) ) {
                        return $cur;
                } else {
                        return $this->mSkin->makeKnownLinkObj(
                                $this->mTitle, $cur,
                                'diff=' . $this->getLatestID() .
-                               "&oldid={$row->rev_id}" );
+                               "&oldid=" . $rev->getId() );
                }
        }
 
        /** @todo document */
-       function lastLink( $row, $next, $counter ) {
-               global $wgUser;
-               $last = htmlspecialchars( wfMsg( 'last' ) );
-               if( is_null( $next )
-                       || ( $row->rev_deleted && !$wgUser->isAllowed( 'undelete' ) ) ) {
+       function lastLink( $rev, $next, $counter ) {
+               $last = wfMsgExt( 'last', array( 'escape' ) );
+               if ( is_null( $next ) ) {
+                       # Probably no next row
+                       return $last;
+               } elseif ( $next === 'unknown' ) {
+                       # Next row probably exists but is unknown, use an oldid=prev link
+                       return $this->mSkin->makeKnownLinkObj(
+                               $this->mTitle,
+                               $last,
+                               "diff=" . $rev->getId() . "&oldid=prev" );
+               } elseif( !$rev->userCan( Revision::DELETED_TEXT ) ) {
                        return $last;
                } else {
                        return $this->mSkin->makeKnownLinkObj(
                                $this->mTitle,
                                $last,
-                               "diff={$row->rev_id}&oldid={$next->rev_id}"
+                               "diff=" . $rev->getId() . "&oldid={$next->rev_id}"
                                /*,
                                '',
                                '',
@@ -305,24 +343,28 @@ class PageHistory {
                }
        }
 
-       /** @todo document */
-       function diffButtons( $row, $firstInList, $counter ) {
-               global $wgUser;
+       /**
+        * Create radio buttons for page history
+        *
+        * @param object $rev Revision
+        * @param bool $firstInList Is this version the first one?
+        * @param int $counter A counter of what row number we're at, counted from the top row = 1.
+        * @return string HTML output for the radio buttons
+        */
+       function diffButtons( $rev, $firstInList, $counter ) {
                if( $this->linesonpage > 1) {
                        $radio = array(
                                'type'  => 'radio',
-                               'value' => $row->rev_id,
-# do we really need to flood this on every item?
-#                              'title' => wfMsgHtml( 'selectolderversionfordiff' )
+                               'value' => $rev->getId(),
                        );
 
-                       if( $row->rev_deleted && !$wgUser->isAllowed( 'undelete' ) ) {
+                       if( !$rev->userCan( Revision::DELETED_TEXT ) ) {
                                $radio['disabled'] = 'disabled';
                        }
 
                        /** @todo: move title texts to javascript */
                        if ( $firstInList ) {
-                               $first = wfElement( 'input', array_merge(
+                               $first = Xml::element( 'input', array_merge(
                                        $radio,
                                        array(
                                                'style' => 'visibility:hidden',
@@ -334,13 +376,13 @@ class PageHistory {
                                } else {
                                        $checkmark = array();
                                }
-                               $first = wfElement( 'input', array_merge(
+                               $first = Xml::element( 'input', array_merge(
                                        $radio,
                                        $checkmark,
                                        array( 'name'  => 'oldid' ) ) );
                                $checkmark = array();
                        }
-                       $second = wfElement( 'input', array_merge(
+                       $second = Xml::element( 'input', array_merge(
                                $radio,
                                $checkmark,
                                array( 'name'  => 'diff' ) ) );
@@ -351,78 +393,31 @@ class PageHistory {
        }
 
        /** @todo document */
-       function getLatestOffset( $id = null ) {
-               if ( $id === null) $id = $this->mTitle->getArticleID();
-               return $this->getExtremeOffset( $id, 'max' );
-       }
-
-       /** @todo document */
-       function getEarliestOffset( $id = null ) {
-               if ( $id === null) $id = $this->mTitle->getArticleID();
-               return $this->getExtremeOffset( $id, 'min' );
-       }
-
-       /** @todo document */
-       function getExtremeOffset( $id, $func ) {
-               $db =& wfGetDB(DB_SLAVE);
-               return $db->selectField( 'revision',
-                       "$func(rev_timestamp)",
-                       array( 'rev_page' => $id ),
-                       'PageHistory::getExtremeOffset' );
-       }
-
-       /** @todo document */
-       function getLatestID( $id = null ) {
-               if ( $id === null) $id = $this->mTitle->getArticleID();
-               $db =& wfGetDB(DB_SLAVE);
-               return $db->selectField( 'revision',
-                       "max(rev_id)",
-                       array( 'rev_page' => $id ),
-                       'PageHistory::getLatestID' );
-       }
-
-       /** @todo document */
-       function getLastOffsetForPaging( $id, $step ) {
-               $fname = 'PageHistory::getLastOffsetForPaging';
-
-               $dbr =& wfGetDB(DB_SLAVE);
-               $res = $dbr->select(
-                       'revision',
-                       'rev_timestamp',
-                       "rev_page=$id",
-                       $fname,
-                       array('ORDER BY' => 'rev_timestamp ASC', 'LIMIT' => $step));
-
-               $n = $dbr->numRows( $res );
-               $last = null;
-               while( $obj = $db->fetchObject( $res ) ) {
-                       $last = $obj->rev_timestamp;
+       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 ),
+                               'PageHistory::getLatestID' );
                }
-               $db->freeResult( $res );
-               return $last;
+               return $this->mLatestId;
        }
 
        /**
-        * @return returns the direction of browsing watchlist
+        * Fetch an array of revisions, specified by a given limit, offset and
+        * direction. This is now only used by the feeds. It was previously 
+        * used by the main UI but that's now handled by the pager.
         */
-       function getDirection() {
-               global $wgRequest;
-               if ($wgRequest->getText("dir") == "prev")
-                       return DIR_PREV;
-               else
-                       return DIR_NEXT;
-       }
-
-       /** @todo document */
        function fetchRevisions($limit, $offset, $direction) {
-               global $wgUser, $wgShowUpdatedMarker;
                $fname = 'PageHistory::fetchRevisions';
 
-               $dbr =& wfGetDB( DB_SLAVE );
+               $dbr = wfGetDB( DB_SLAVE );
 
-               if ($direction == DIR_PREV)
+               if ($direction == PageHistory::DIR_PREV)
                        list($dirs, $oper) = array("ASC", ">=");
-               else /* $direction == DIR_NEXT */
+               else /* $direction == PageHistory::DIR_NEXT */
                        list($dirs, $oper) = array("DESC", "<=");
 
                if ($offset)
@@ -434,8 +429,7 @@ class PageHistory {
 
                $res = $dbr->select(
                        'revision',
-                       array('rev_id', 'rev_user', 'rev_comment', 'rev_user_text',
-                               'rev_timestamp', 'rev_minor_edit', 'rev_deleted'),
+                       Revision::selectFields(),
                        array_merge(array("rev_page=$page_id"), $offsets),
                        $fname,
                        array('ORDER BY' => "rev_timestamp $dirs",
@@ -460,7 +454,7 @@ class PageHistory {
                if ($wgUser->isAnon() || !$wgShowUpdatedMarker)
                        return $this->mNotificationTimestamp = false;
 
-               $dbr =& wfGetDB(DB_SLAVE);
+               $dbr = wfGetDB(DB_SLAVE);
 
                $this->mNotificationTimestamp = $dbr->selectField(
                        'watchlist',
@@ -470,84 +464,165 @@ class PageHistory {
                                'wl_user' => $wgUser->getID()
                        ),
                        $fname);
+               
+               // 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;
        }
-
-       /** @todo document */
-       function makeNavbar($revisions, $offset, $limit, $direction) {
-               global $wgTitle, $wgLang;
-
-               $revisions = array_slice($revisions, 0, $limit);
-
-               $latestTimestamp = wfTimestamp(TS_MW, $this->getLatestOffset());
-               $earliestTimestamp = wfTimestamp(TS_MW, $this->getEarliestOffset());
-
-               /*
-                * When we're displaying previous revisions, we need to reverse
-                * the array, because it's queried in reverse order.
-                */
-               if ($direction == DIR_PREV)
-                       $revisions = array_reverse($revisions);
-
-               /*
-                * lowts is the timestamp of the first revision on this page.
-                * hights is the timestamp of the last revision.
-                */
-
-               $lowts = $hights = 0;
-
-               if( count( $revisions ) ) {
-                       $latestShown = wfTimestamp(TS_MW, $revisions[0]->rev_timestamp);
-                       $earliestShown = wfTimestamp(TS_MW, $revisions[count($revisions) - 1]->rev_timestamp);
-               }
-
-               /* Don't announce the limit everywhere if it's the default */
-               $usefulLimit = $limit == $this->defaultLimit ? '' : $limit;
-
-               $urls = array();
-               foreach (array(20, 50, 100, 250, 500) as $num) {
-                       $urls[] = $this->MakeLink( $wgLang->formatNum($num),
-                               array('offset' => $offset == 0 ? '' : wfTimestamp(TS_MW, $offset), 'limit' => $num, ) );
+       
+       /**
+        * Output a subscription feed listing recent edits to this page.
+        * @param string $type
+        */
+       function feed( $type ) {
+               require_once 'SpecialRecentchanges.php';
+               
+               global $wgFeedClasses;
+               if( !isset( $wgFeedClasses[$type] ) ) {
+                       global $wgOut;
+                       $wgOut->addWikiText( wfMsg( 'feed-invalid' ) );
+                       return;
                }
-
-               $bits = implode($urls, ' | ');
-
-               wfDebug("latestShown=$latestShown latestTimestamp=$latestTimestamp\n");
-               if( $latestShown < $latestTimestamp ) {
-                       $prevtext = $this->MakeLink( wfMsgHtml("prevn", $limit),
-                               array( 'dir' => 'prev', 'offset' => $latestShown, 'limit' => $usefulLimit ) );
-                       $lasttext = $this->MakeLink( wfMsgHtml('histlast'),
-                               array( 'limit' => $usefulLimit ) );
+               
+               $feed = new $wgFeedClasses[$type](
+                       $this->mTitle->getPrefixedText() . ' - ' .
+                               wfMsgForContent( 'history-feed-title' ),
+                       wfMsgForContent( 'history-feed-description' ),
+                       $this->mTitle->getFullUrl( 'action=history' ) );
+
+               $items = $this->fetchRevisions(10, 0, PageHistory::DIR_NEXT);
+               $feed->outHeader();
+               if( $items ) {
+                       foreach( $items as $row ) {
+                               $feed->outItem( $this->feedItem( $row ) );
+                       }
                } else {
-                       $prevtext = wfMsgHtml("prevn", $limit);
-                       $lasttext = wfMsgHtml('histlast');
+                       $feed->outItem( $this->feedEmpty() );
                }
-
-               wfDebug("earliestShown=$earliestShown earliestTimestamp=$earliestTimestamp\n");
-               if( $earliestShown > $earliestTimestamp ) {
-                       $nexttext = $this->MakeLink( wfMsgHtml("nextn", $limit),
-                               array( 'offset' => $earliestShown, 'limit' => $usefulLimit ) );
-                       $firsttext = $this->MakeLink( wfMsgHtml('histfirst'),
-                               array( 'go' => 'first', 'limit' => $usefulLimit ) );
+               $feed->outFooter();
+       }
+       
+       function feedEmpty() {
+               global $wgOut;
+               return new FeedItem(
+                       wfMsgForContent( 'nohistory' ),
+                       $wgOut->parse( wfMsgForContent( 'history-feed-empty' ) ),
+                       $this->mTitle->getFullUrl(),
+                       wfTimestamp( TS_MW ),
+                       '',
+                       $this->mTitle->getTalkPage()->getFullUrl() );
+       }
+       
+       /**
+        * Generate a FeedItem object from a given revision table row
+        * Borrows Recent Changes' feed generation functions for formatting;
+        * includes a diff to the previous revision (if any).
+        *
+        * @param $row
+        * @return FeedItem
+        */
+       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() );
+               
+               if( $rev->getComment() == '' ) {
+                       global $wgContLang;
+                       $title = wfMsgForContent( 'history-feed-item-nocomment',
+                               $rev->getUserText(),
+                               $wgContLang->timeanddate( $rev->getTimestamp() ) );
                } else {
-                       $nexttext = wfMsgHtml("nextn", $limit);
-                       $firsttext = wfMsgHtml('histfirst');
+                       $title = $rev->getUserText() . ": " . $this->stripComment( $rev->getComment() );
                }
 
-               $firstlast = "($lasttext | $firsttext)";
+               return new FeedItem(
+                       $title,
+                       $text,
+                       $this->mTitle->getFullUrl( 'diff=' . $rev->getId() . '&oldid=prev' ),
+                       $rev->getTimestamp(),
+                       $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 );
+       }
+}
+
 
-               return "$firstlast " . wfMsgHtml("viewprevnext", $prevtext, $nexttext, $bits);
+/**
+ * @addtogroup Pager
+ */
+class PageHistoryPager extends ReverseChronologicalPager {
+       public $mLastRow = false, $mPageHistory;
+       
+       function __construct( $pageHistory ) {
+               parent::__construct();
+               $this->mPageHistory = $pageHistory;
        }
 
-       function MakeLink($text, $query = NULL) {
-               if ( $query === null ) return $text;
-               return $this->mSkin->makeKnownLinkObj(
-                               $this->mTitle, $text,
-                               wfArrayToCGI( $query, array( 'action' => 'history' )));
+       function getQueryInfo() {
+               return array(
+                       'tables' => 'revision',
+                       'fields' => Revision::selectFields(),
+                       'conds' => array('rev_page' => $this->mPageHistory->mTitle->getArticleID() ),
+                       'options' => array( 'USE INDEX' => 'page_timestamp' )
+               );
        }
 
+       function getIndexField() {
+               return 'rev_timestamp';
+       }
 
-}
+       function formatRow( $row ) {
+               if ( $this->mLastRow ) {
+                       $latest = $this->mCounter == 1 && $this->mOffset == '';
+                       $firstInList = $this->mCounter == 1;
+                       $s = $this->mPageHistory->historyLine( $this->mLastRow, $row, $this->mCounter++, 
+                               $this->mPageHistory->getNotificationTimestamp(), $latest, $firstInList );
+               } else {
+                       $s = '';
+               }
+               $this->mLastRow = $row;
+               return $s;
+       }
+       
+       function getStartBody() {
+               $this->mLastRow = false;
+               $this->mCounter = 1;
+               return '';
+       }
 
-?>
+       function getEndBody() {
+               if ( $this->mLastRow ) {
+                       $latest = $this->mCounter == 1 && $this->mOffset == 0;
+                       $firstInList = $this->mCounter == 1;
+                       if ( $this->mIsBackwards ) {
+                               # Next row is unknown, but for UI reasons, probably exists if an offset has been specified
+                               if ( $this->mOffset == '' ) {
+                                       $next = null;
+                               } else {
+                                       $next = 'unknown';
+                               }
+                       } else {
+                               # The next row is the past-the-end row
+                               $next = $this->mPastTheEndRow;
+                       }
+                       $s = $this->mPageHistory->historyLine( $this->mLastRow, $next, $this->mCounter++, 
+                               $this->mPageHistory->getNotificationTimestamp(), $latest, $firstInList );
+               } else {
+                       $s = '';
+               }
+               return $s;
+       }
+}