X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPageHistory.php;h=cbef1f4ca9398081874b1e82340b3d26d9918719;hb=b2503c70abbc3e5926cfa57c68c5c4be0147fab5;hp=f134851774e9358755e2c86ad6d2467782b86752;hpb=9e2fca384699a17e262ea054dbcc5a86d43c7c86;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/PageHistory.php b/includes/PageHistory.php index f134851774..cbef1f4ca9 100644 --- a/includes/PageHistory.php +++ b/includes/PageHistory.php @@ -22,8 +22,9 @@ class PageHistory { var $mArticle, $mTitle, $mSkin; var $lastdate; var $linesonpage; - var $mNotificationTimestamp; var $mLatestId = null; + + private $mOldIdChecked = 0; /** * Construct a new PageHistory. @@ -31,12 +32,10 @@ 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(); } @@ -44,7 +43,7 @@ class PageHistory { function getArticle() { return $this->mArticle; } - + function getTitle() { return $this->mTitle; } @@ -74,8 +73,7 @@ class PageHistory { * 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__ ); @@ -92,7 +90,8 @@ class PageHistory { $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' ); @@ -110,34 +109,24 @@ 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 - */ - 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; - } - /** * Add date selector to quickly get to a certain time */ $year = $wgRequest->getInt( 'year' ); $month = $wgRequest->getInt( 'month' ); - + $tagFilter = $wgRequest->getVal( 'tagfilter' ); + $tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter ); + $action = htmlspecialchars( $wgScript ); - $wgOut->addHTML( - "
" . + $wgOut->addHTML( + "" . + 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 ) . ' ' . + xml::dateMenu( $year, $month ) . ' ' . + ( $tagSelector ? ( implode( ' ', $tagSelector ) . ' ' ) : '' ) . Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" . - '
' + '' ); wfRunHooks( 'PageHistoryBeforeList', array( &$this->mArticle ) ); @@ -145,7 +134,7 @@ class PageHistory { /** * Do the list */ - $pager = new PageHistoryPager( $this, $year, $month ); + $pager = new PageHistoryPager( $this, $year, $month, $tagFilter ); $this->linesonpage = $pager->getNumRows(); $wgOut->addHTML( $pager->getNavigationBar() . @@ -154,39 +143,9 @@ 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 @@ -194,12 +153,36 @@ class PageHistory { * @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 .= ''; - $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 .= ''; return $s; } @@ -219,19 +227,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 ''; } @@ -255,132 +257,130 @@ 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 = "$del"; + $query = array( 'target' => $this->mTitle->getPrefixedDbkey(), + 'oldid' => $rev->getId() + ); + $del = $this->mSkin->revDeleteLink( $query, $rev->isDeleted( Revision::DELETED_RESTRICTED ) ); } - $s .= " ($del) "; + $s .= " $del "; } $s .= " $link"; $s .= " " . $this->mSkin->revUserTools( $rev, true ) . ""; - if( $row->rev_minor_edit ) { + if( $rev->isMinor() ) { $s .= ' ' . Xml::element( 'span', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') ); } - if ( !is_null( $size = $rev->getSize() ) && $rev->userCan( Revision::DELETED_TEXT ) ) { + if( !is_null( $size = $rev->getSize() ) && !$rev->isDeleted( 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 .= ' ' . wfMsgHtml( 'updatedmarker' ) . ''; } - #add blurb about text having been deleted if( $rev->isDeleted( Revision::DELETED_TEXT ) ) { $s .= ' ' . wfMsgHtml( 'deletedrev' ) . ''; } $tools = array(); - if ( !is_null( $next ) && is_object( $next ) ) { - if( !$this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser ) - && !$this->mTitle->getUserPermissionsErrors( 'edit', $wgUser ) - && $latest ) { - $tools[] = '' - . $this->mSkin->buildRollbackLink( $rev ) - . ''; + if( !is_null( $next ) && is_object( $next ) ) { + if( $latest && $this->mTitle->userCan( 'rollback' ) && $this->mTitle->userCan( 'edit' ) ) { + $tools[] = ''.$this->mSkin->buildRollbackLink( $rev ).''; } - 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[] = "{$undolink}"; } } if( $tools ) { - $s .= ' (' . implode( ' | ', $tools ) . ')'; + $s .= ' (' . $wgLang->pipeList( $tools ) . ')'; } + # Tags + list($tagSummary, $newClasses) = ChangeTags::formatSummaryRow( $row->ts_tags, 'history' ); + $classes = array_merge( $classes, $newClasses ); + $s .= " $tagSummary"; + wfRunHooks( 'PageHistoryLineEnding', array( $this, &$row , &$s ) ); - return "
  • $s
    • \n"; + $classes = implode( ' ', $classes ); + + return "
  • $s
    • \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() ); + if( !$rev->isDeleted( Revision::DELETED_TEXT ) ) { + $link = $this->mSkin->makeKnownLinkObj( $this->mTitle, $date, "oldid=" . $rev->getId() ); } else { - $link = $date; - } - if( $rev->isDeleted( Revision::DELETED_TEXT ) ) { - return '' . $link . ''; + $link = '' . $date . ''; } return $link; } /** - * 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 ) ) { + if( $latest || $rev->isDeleted( 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" @@ -390,21 +390,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) ) { + } elseif( $prevRev->isDeleted(Revision::DELETED_TEXT) || $nextRev->isDeleted(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}" ); } } @@ -417,59 +409,35 @@ class PageHistory { * @return string HTML output for the radio buttons */ function diffButtons( $rev, $firstInList, $counter ) { - if( $this->linesonpage > 1) { - $radio = array( - 'type' => 'radio', - 'value' => $rev->getId(), - ); - - if( !$rev->userCan( Revision::DELETED_TEXT ) ) { - $radio['disabled'] = 'disabled'; - } - + if( $this->linesonpage > 1 ) { + $radio = array( 'type' => 'radio', 'value' => $rev->getId() ); /** @todo: move title texts to javascript */ - if ( $firstInList ) { - $first = Xml::element( 'input', array_merge( - $radio, - array( - 'style' => 'visibility:hidden', - 'name' => 'oldid' ) ) ); + if( $firstInList ) { + $first = Xml::element( 'input', + array_merge( $radio, array( 'style' => 'visibility:hidden', 'name' => 'oldid' ) ) + ); $checkmark = array( 'checked' => 'checked' ); } else { - if( $counter == 2 ) { + # Check visibility of old revisions + if( $rev->isDeleted( Revision::DELETED_TEXT ) ) { + $radio['disabled'] = 'disabled'; + $checkmark = array(); // We will check the next possible one + } else if( $counter == 2 || !$this->mOldIdChecked ) { $checkmark = array( 'checked' => 'checked' ); + $this->mOldIdChecked = $rev->getId(); } else { $checkmark = array(); } - $first = Xml::element( 'input', array_merge( - $radio, - $checkmark, - array( 'name' => 'oldid' ) ) ); + $first = Xml::element( 'input', array_merge( $radio, $checkmark, array( 'name' => 'oldid' ) ) ); $checkmark = array(); } - $second = Xml::element( 'input', array_merge( - $radio, - $checkmark, - array( 'name' => 'diff' ) ) ); + $second = Xml::element( 'input', array_merge( $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 @@ -478,72 +446,42 @@ 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(); - return $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) ); } - /** @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; - } - /** * Output a subscription feed listing recent edits to this page. * @param string $type */ function feed( $type ) { global $wgFeedClasses, $wgRequest, $wgFeedLimit; - if ( !FeedUtils::checkFeedOutput($type) ) { + 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) @@ -551,7 +489,7 @@ class PageHistory { if( $limit > $wgFeedLimit || $limit < 1 ) { $limit = 10; } - $items = $this->fetchRevisions($limit, 0, PageHistory::DIR_NEXT); + $items = $this->fetchRevisions($limit, 0, PageHistory::DIR_NEXT); $feed->outHeader(); if( $items ) { @@ -571,7 +509,7 @@ class PageHistory { $wgOut->parse( wfMsgForContent( 'history-feed-empty' ) ), $this->mTitle->getFullUrl(), wfTimestamp( TS_MW ), - '', + '', $this->mTitle->getTalkPage()->getFullUrl() ); } @@ -587,18 +525,18 @@ class PageHistory { $rev = new Revision( $row ); $rev->setTitle( $this->mTitle ); $text = FeedUtils::formatDiffRow( $this->mTitle, - $this->mTitle->getPreviousRevisionID( $rev->getId() ), - $rev->getId(), - $rev->getTimestamp(), - $rev->getComment() ); + $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( @@ -609,13 +547,6 @@ 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 ); - } } @@ -623,21 +554,25 @@ class PageHistory { * @ingroup Pager */ class PageHistoryPager extends ReverseChronologicalPager { - public $mLastRow = false, $mPageHistory; + public $mLastRow = false, $mPageHistory, $mTitle; - function __construct( $pageHistory, $year='', $month='' ) { + 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() { $queryInfo = array( 'tables' => array('revision'), - 'fields' => Revision::selectFields(), + 'fields' => array_merge( Revision::selectFields(), array('ts_tags') ), 'conds' => array('rev_page' => $this->mPageHistory->mTitle->getArticleID() ), - 'options' => array( 'USE INDEX' => array('revision' => 'page_timestamp') ) + '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; } @@ -647,11 +582,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 = ''; } @@ -666,12 +601,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'; @@ -681,7 +616,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 = ''; }