X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPageHistory.php;h=7e31c0c66ac7336d55da7500d0f58bb5d6212526;hb=42fe290d16f66ba3d719bc6149cc79570e55a6b3;hp=4ba67a289bac0847548ef5bdc67bc3fa1dfc465f;hpb=657831a2f5ef8f2ece9447ae2ed7007680d71d16;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index 4ba67a289b..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();
}
@@ -68,14 +67,13 @@ class PageHistory {
* @returns nothing
*/
function history() {
- global $wgOut, $wgRequest, $wgTitle, $wgScript;
+ 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__ );
@@ -92,7 +90,13 @@ class PageHistory {
$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' );
@@ -110,83 +114,42 @@ 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(
- Xml::fieldset( wfMsg( 'history-search' ), false, array( 'id' => 'mw-history-search' ) ) .
- "'
- );
+ "'
+ );
- wfRunHooks( 'PageHistoryBeforeList', array( &$this->mArticle ) );
+ wfRunHooks( 'PageHistoryBeforeList', array( &$this->mArticle ) );
- /**
- * Do the list
- */
- $pager = new PageHistoryPager( $this, $year, $month );
- $this->linesonpage = $pager->getNumRows();
- $wgOut->addHTML(
+ /**
+ * Do the list
+ */
+ $pager = new PageHistoryPager( $this, $year, $month, $tagFilter );
+ $this->linesonpage = $pager->getNumRows();
+ $wgOut->addHTML(
$pager->getNavigationBar() .
$this->beginHistoryList() .
$pager->getBody() .
$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 );
+ wfProfileOut( __METHOD__ );
}
/**
@@ -195,34 +158,52 @@ class PageHistory {
* @return string HTML output
*/
function beginHistoryList() {
- global $wgTitle, $wgScript, $wgEnableHtmlDiff;
+ global $wgUser, $wgScript, $wgEnableHtmlDiff;
$this->lastdate = '';
$s = wfMsgExt( 'histlegend', array( 'parse') );
- $s .= Xml::openElement( 'form', array( 'action' => $wgScript ) );
- $s .= Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() );
- if($wgEnableHtmlDiff){
+ 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(
+ array(
'name' => 'htmldiff',
'class' => 'historysubmit',
'accesskey' => wfMsg( 'accesskey-visualcomparison' ),
'title' => wfMsg( 'tooltip-compareselectedversions' ),
- )
+ )
);
$s .= $this->submitButton( wfMsg( 'wikicodecomparison'),
- array(
+ array(
'class' => 'historysubmit',
'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
'title' => wfMsg( 'tooltip-compareselectedversions' ),
- )
+ )
);
- }else{
+ } else {
$s .= $this->submitButton( wfMsg( 'compareselectedversions'),
- array(
+ array(
'class' => 'historysubmit',
'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
'title' => wfMsg( 'tooltip-compareselectedversions' ),
- )
+ )
);
}
$s .= '' . "\n";
@@ -237,29 +218,29 @@ class PageHistory {
function endHistoryList() {
global $wgEnableHtmlDiff;
$s = '
';
- if($wgEnableHtmlDiff){
+ if( $wgEnableHtmlDiff ) {
$s .= $this->submitButton( wfMsg( 'visualcomparison'),
- array(
+ array(
'name' => 'htmldiff',
'class' => 'historysubmit',
'accesskey' => wfMsg( 'accesskey-visualcomparison' ),
'title' => wfMsg( 'tooltip-compareselectedversions' ),
- )
+ )
);
$s .= $this->submitButton( wfMsg( 'wikicodecomparison'),
- array(
+ array(
'class' => 'historysubmit',
'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
'title' => wfMsg( 'tooltip-compareselectedversions' ),
- )
+ )
);
- }else{
+ } else {
$s .= $this->submitButton( wfMsg( 'compareselectedversions'),
- array(
+ array(
'class' => 'historysubmit',
'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
'title' => wfMsg( 'tooltip-compareselectedversions' ),
- )
+ )
);
}
$s .= '';
@@ -274,7 +255,7 @@ class PageHistory {
*/
function submitButton($message, $attributes = array() ) {
# Disable submit button if history has 1 revision only
- if ( $this->linesonpage > 1 ) {
+ if( $this->linesonpage > 1 ) {
return Xml::submitButton( $message , $attributes );
} else {
return '';
@@ -294,75 +275,77 @@ 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 ) ) {
- // If revision was hidden from sysops
- $del = $this->message['rev-delundel'];
+ // Hide JS by default for non-JS browsing
+ $hidden = array( 'style' => 'display:none' );
+ // If revision was hidden from sysops
+ 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( !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 ) {
-
+ 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' ) )
@@ -379,12 +362,19 @@ class PageHistory {
}
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";
}
/**
@@ -395,14 +385,17 @@ class PageHistory {
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;
}
@@ -418,10 +411,16 @@ class PageHistory {
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' )
+ );
}
}
@@ -441,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(
- $this->mTitle,
- $last,
- "diff=" . $prevRev->getId() . "&oldid=prev" );
+ return $this->mSkin->link(
+ $this->mTitle,
+ $last,
+ 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(
- $this->mTitle,
- $last,
- "diff=" . $prevRev->getId() . "&oldid={$next->rev_id}"
- /*,
- '',
- '',
- "tabindex={$counter}"*/ );
+ return $this->mSkin->link(
+ $this->mTitle,
+ $last,
+ array(),
+ array(
+ 'diff' => $prevRev->getId(),
+ 'oldid' => $next->rev_id
+ ),
+ array( 'known', 'noclasses' )
+ );
}
}
@@ -468,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
@@ -529,72 +522,43 @@ class PageHistory {
function fetchRevisions($limit, $offset, $direction) {
$dbr = wfGetDB( DB_SLAVE );
- if ($direction == PageHistory::DIR_PREV)
- list($dirs, $oper) = array("ASC", ">=");
+ if( $direction == PageHistory::DIR_PREV )
+ list($dirs, $oper) = array("ASC", ">=");
else /* $direction == PageHistory::DIR_NEXT */
- list($dirs, $oper) = array("DESC", "<=");
+ list($dirs, $oper) = array("DESC", "<=");
- if ($offset)
- $offsets = array("rev_timestamp $oper '$offset'");
+ if( $offset )
+ $offsets = array("rev_timestamp $oper '$offset'");
else
- $offsets = array();
+ $offsets = array();
$page_id = $this->mTitle->getArticleID();
- return $dbr->select(
- 'revision',
- Revision::selectFields(),
- array_merge(array("rev_page=$page_id"), $offsets),
- __METHOD__,
- array('ORDER BY' => "rev_timestamp $dirs",
+ return $dbr->select( 'revision',
+ Revision::selectFields(),
+ array_merge(array("rev_page=$page_id"), $offsets),
+ __METHOD__,
+ 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( 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)
@@ -618,12 +582,13 @@ class PageHistory {
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() );
+ wfMsgForContent( 'nohistory' ),
+ $wgOut->parse( wfMsgForContent( 'history-feed-empty' ) ),
+ $this->mTitle->getFullUrl(),
+ wfTimestamp( TS_MW ),
+ '',
+ $this->mTitle->getTalkPage()->getFullUrl()
+ );
}
/**
@@ -637,58 +602,67 @@ class PageHistory {
function feedItem( $row ) {
$rev = new Revision( $row );
$rev->setTitle( $this->mTitle );
- $text = FeedUtils::formatDiffRow( $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;
+ $ts = $rev->getTimestamp();
$title = wfMsgForContent( 'history-feed-item-nocomment',
- $rev->getUserText(),
- $wgContLang->timeanddate( $rev->getTimestamp() ) );
+ $rev->getUserText(),
+ $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' ),
- $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 );
+ $title,
+ $text,
+ $this->mTitle->getFullUrl( array(
+ 'diff' => $rev->getId(),
+ 'oldid' => 'prev'
+ ) ),
+ $rev->getTimestamp(),
+ $rev->getUserText(),
+ $this->mTitle->getTalkPage()->getFullUrl()
+ );
}
}
-
/**
* @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'],
+ $queryInfo['options'],
+ $this->tagFilter );
wfRunHooks( 'PageHistoryPager::getQueryInfo', array( &$this, &$queryInfo ) );
return $queryInfo;
}
@@ -698,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 = '';
}
@@ -717,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';
@@ -732,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 = '';
}