X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPageHistory.php;h=7e31c0c66ac7336d55da7500d0f58bb5d6212526;hb=42fe290d16f66ba3d719bc6149cc79570e55a6b3;hp=08217343ab681a8b8d3854834171bfa7e057b5bc;hpb=58f7bb30a04d6c1f137cc1659b8998c5349bf13e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/PageHistory.php b/includes/PageHistory.php index 08217343ab..7e31c0c66a 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; } @@ -68,15 +67,13 @@ class PageHistory { * @returns nothing */ function history() { - global $wgOut, $wgRequest, $wgTitle; + global $wgOut, $wgRequest, $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__ ); @@ -87,13 +84,19 @@ 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->link( + $logPage, + wfMsgHtml( 'viewpagelogs' ), + array(), + array( 'page' => $this->mTitle->getPrefixedText() ), + array( 'known', 'noclasses' ) + ); $wgOut->setSubtitle( $logLink ); $feedType = $wgRequest->getVal( 'feed' ); @@ -111,26 +114,32 @@ 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' ); + $tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter ); + + $action = htmlspecialchars( $wgScript ); + $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" . + xml::dateMenu( $year, $month ) . ' ' . + ( $tagSelector ? ( implode( ' ', $tagSelector ) . ' ' ) : '' ) . + Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" . + '
' + ); 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() . @@ -139,6 +148,7 @@ class PageHistory { $this->endHistoryList() . $pager->getNavigationBar() ); + wfProfileOut( __METHOD__ ); } @@ -148,12 +158,54 @@ class PageHistory { * @return string HTML output */ function beginHistoryList() { - global $wgTitle, $wgScript; + global $wgUser, $wgScript, $wgEnableHtmlDiff; $this->lastdate = ''; $s = wfMsgExt( 'histlegend', array( 'parse') ); - $s .= Xml::openElement( 'form', array( 'action' => $wgScript ) ); - $s .= Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() ); - $s .= $this->submitButton(); + if( $this->linesonpage > 1 && $wgUser->isAllowed('deleterevision') ) { + $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); + $s .= Xml::openElement( 'form', + array( + 'action' => $revdel->getLocalURL( array( + 'type' => 'revision', + 'target' => $this->mTitle->getPrefixedDbKey() + ) ), + 'method' => 'post', + 'id' => 'mw-history-revdeleteform', + 'style' => 'visibility:hidden;float:right;' + ) + ); + $s .= Xml::hidden( 'ids', '', array('id'=>'revdel-oldid') ); + $s .= Xml::submitButton( wfMsg( 'showhideselectedversions' ) ); + $s .= Xml::closeElement( 'form' ); + } + $s .= Xml::openElement( 'form', array( 'action' => $wgScript, + 'id' => 'mw-history-compare' ) ); + $s .= Xml::hidden( 'title', $this->mTitle->getPrefixedDbKey() ); + 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; } @@ -173,19 +250,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 ''; } @@ -204,141 +275,162 @@ class PageHistory { * @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 ) { + function historyLine( $row, $next, $counter = '', $notificationtimestamp = false, + $latest = false, $firstInList = false ) + { global $wgUser, $wgLang; $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']; - } else if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) { + // Hide JS by default for non-JS browsing + $hidden = array( 'style' => 'display:none' ); // If revision was hidden from sysops - $del = $this->message['rev-delundel']; + if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) { + $del = Xml::check( 'deleterevisions', false, + $hidden + array('disabled' => 'disabled') ); + $del .= Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), + '(' . $this->message['rev-delundel'] . ')' ); + // Otherwise, show the link... } 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"; + $id = $rev->getId(); + $jsCall = "updateShowHideForm($id,this.checked)"; + $del = Xml::check( 'showhiderevisions', false, + $hidden + array( + 'onchange' => $jsCall, + 'id' => "mw-revdel-$id" ) ); + $query = array( + 'type' => 'revision', + 'target' => $this->mTitle->getPrefixedDbkey(), + 'ids' => $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 ) { - $s .= ' ' . Xml::element( 'span', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') ); + if( $rev->isMinor() ) { + $s .= ' ' . ChangesList::flag( 'minor' ); } - 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 .= " $stxt"; + 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() ); + $date = htmlspecialchars( $date ); + if( !$rev->isDeleted( Revision::DELETED_TEXT ) ) { + $link = $this->mSkin->link( + $this->mTitle, + $date, + array(), + array( 'oldid' => $rev->getId() ), + array( 'known', 'noclasses' ) + ); } 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 ) ) { return $cur; } else { - return $this->mSkin->makeKnownLinkObj( - $this->mTitle, $cur, - 'diff=' . $this->getLatestID() . - "&oldid=" . $rev->getId() ); + return $this->mSkin->link( + $this->mTitle, + $cur, + array(), + array( + 'diff' => $this->mTitle->getLatestRevID(), + 'oldid' => $rev->getId() + ), + array( 'known', 'noclasses' ) + ); } } /** - * 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" @@ -348,21 +440,29 @@ class PageHistory { return $last; } elseif( $next === 'unknown' ) { # Next row probably exists but is unknown, use an oldid=prev link - return $this->mSkin->makeKnownLinkObj( + return $this->mSkin->link( $this->mTitle, $last, - "diff=" . $prevRev->getId() . "&oldid=prev" ); + array(), + array( + 'diff' => $prevRev->getId(), + 'oldid' => 'prev' + ), + array( 'known', 'noclasses' ) + ); } elseif( !$prevRev->userCan(Revision::DELETED_TEXT) || !$nextRev->userCan(Revision::DELETED_TEXT) ) { return $last; } else { - return $this->mSkin->makeKnownLinkObj( + return $this->mSkin->link( $this->mTitle, $last, - "diff=" . $prevRev->getId() . "&oldid={$next->rev_id}" - /*, - '', - '', - "tabindex={$counter}"*/ ); + array(), + array( + 'diff' => $prevRev->getId(), + 'oldid' => $next->rev_id + ), + array( 'known', 'noclasses' ) + ); } } @@ -375,59 +475,45 @@ 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 ) { + $id = $rev->getId(); + $radio = array( 'type' => 'radio', 'value' => $id ); /** @todo: move title texts to javascript */ - if ( $firstInList ) { - $first = Xml::element( 'input', array_merge( - $radio, - array( + if( $firstInList ) { + $first = Xml::element( 'input', + array_merge( $radio, array( 'style' => 'visibility:hidden', - 'name' => 'oldid' ) ) ); + 'name' => 'oldid', + 'id' => 'mw-oldid-null' ) ) + ); $checkmark = array( 'checked' => 'checked' ); } else { - if( $counter == 2 ) { + # Check visibility of old revisions + if( !$rev->userCan( 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 = $id; } 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', + 'id' => "mw-oldid-$id" ) ) ); $checkmark = array(); } - $second = Xml::element( 'input', array_merge( - $radio, - $checkmark, - array( 'name' => 'diff' ) ) ); + $second = Xml::element( 'input', + array_merge( $radio, $checkmark, array( + 'name' => 'diff', + 'id' => "mw-diff-$id" ) ) ); 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 @@ -436,61 +522,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; + ); } /** @@ -498,8 +548,8 @@ class PageHistory { * @param string $type */ function feed( $type ) { - global $wgFeedClasses; - if ( !FeedUtils::checkFeedOutput($type) ) { + global $wgFeedClasses, $wgRequest, $wgFeedLimit; + if( !FeedUtils::checkFeedOutput($type) ) { return; } @@ -507,9 +557,17 @@ class PageHistory { $this->mTitle->getPrefixedText() . ' - ' . wfMsgForContent( 'history-feed-title' ), wfMsgForContent( 'history-feed-description' ), - $this->mTitle->getFullUrl( 'action=history' ) ); + $this->mTitle->getFullUrl( array( '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 ) { @@ -528,8 +586,9 @@ class PageHistory { $wgOut->parse( wfMsgForContent( 'history-feed-empty' ) ), $this->mTitle->getFullUrl(), wfTimestamp( TS_MW ), - '', - $this->mTitle->getTalkPage()->getFullUrl() ); + '', + $this->mTitle->getTalkPage()->getFullUrl() + ); } /** @@ -543,57 +602,67 @@ class PageHistory { function feedItem( $row ) { $rev = new Revision( $row ); $rev->setTitle( $this->mTitle ); - $text = FeedUtils::formatDiffRow( $this->mTitle, + $text = FeedUtils::formatDiffRow( + $this->mTitle, $this->mTitle->getPreviousRevisionID( $rev->getId() ), $rev->getId(), $rev->getTimestamp(), - $rev->getComment() ); - + $rev->getComment() + ); if( $rev->getComment() == '' ) { global $wgContLang; + $ts = $rev->getTimestamp(); $title = wfMsgForContent( 'history-feed-item-nocomment', $rev->getUserText(), - $wgContLang->timeanddate( $rev->getTimestamp() ) ); + $wgContLang->timeanddate( $ts ), + $wgContLang->date( $ts ), + $wgContLang->time( $ts ) ); } else { - $title = $rev->getUserText() . ": " . $this->stripComment( $rev->getComment() ); + $title = $rev->getUserText() . wfMsgForContent( 'colon-separator' ) . + FeedItem::stripComment( $rev->getComment() ); } - return new FeedItem( $title, $text, - $this->mTitle->getFullUrl( 'diff=' . $rev->getId() . '&oldid=prev' ), + $this->mTitle->getFullUrl( array( + '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 ); + $this->mTitle->getTalkPage()->getFullUrl() + ); } } - /** * @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() { $queryInfo = array( - 'tables' => array('revision'), - 'fields' => Revision::selectFields(), - 'conds' => array('rev_page' => $this->mPageHistory->mTitle->getArticleID() ), - 'options' => array( 'USE INDEX' => array('revision','page_timestamp') ) + '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'], + $queryInfo['options'], + $this->tagFilter ); wfRunHooks( 'PageHistoryPager::getQueryInfo', array( &$this, &$queryInfo ) ); return $queryInfo; } @@ -603,11 +672,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 +691,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 +706,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 = ''; }