* Moved action=history to use an Action subclass

* Removed obsolete aliases PageHistory and PageHistoryPager; unused
* Maintained backward compatibility with HistoryPage; extensions using it will still work
* Use local context instead of global variables
* Removed calls to OutputPage::setPageTitleActionText() and OutputPage::setSyndicated(), the first one does nothing and the second one is overriden by the setFeedAppendQuery() call just below
* Call Linker methods statically
* Fixed bug where feedEmpty() was not called on empty history since casting a ResultWrapper object to boolean always returns true even when there's no row
This commit is contained in:
Alexandre Emsenhuber 2011-08-06 19:41:49 +00:00
parent e8f1ccfacb
commit 2d045fa152
4 changed files with 126 additions and 152 deletions

View file

@ -93,8 +93,6 @@ $wgAutoloadLocalClasses = array(
'HistoryBlob' => 'includes/HistoryBlob.php', 'HistoryBlob' => 'includes/HistoryBlob.php',
'HistoryBlobCurStub' => 'includes/HistoryBlob.php', 'HistoryBlobCurStub' => 'includes/HistoryBlob.php',
'HistoryBlobStub' => 'includes/HistoryBlob.php', 'HistoryBlobStub' => 'includes/HistoryBlob.php',
'HistoryPage' => 'includes/HistoryPage.php',
'HistoryPager' => 'includes/HistoryPage.php',
'Hooks' => 'includes/Hooks.php', 'Hooks' => 'includes/Hooks.php',
'Html' => 'includes/Html.php', 'Html' => 'includes/Html.php',
'HTMLCheckField' => 'includes/HTMLForm.php', 'HTMLCheckField' => 'includes/HTMLForm.php',
@ -159,8 +157,6 @@ $wgAutoloadLocalClasses = array(
'OldChangesList' => 'includes/ChangesList.php', 'OldChangesList' => 'includes/ChangesList.php',
'OutputPage' => 'includes/OutputPage.php', 'OutputPage' => 'includes/OutputPage.php',
'Page' => 'includes/WikiPage.php', 'Page' => 'includes/WikiPage.php',
'PageHistory' => 'includes/HistoryPage.php',
'PageHistoryPager' => 'includes/HistoryPage.php',
'PageQueryPage' => 'includes/PageQueryPage.php', 'PageQueryPage' => 'includes/PageQueryPage.php',
'Pager' => 'includes/Pager.php', 'Pager' => 'includes/Pager.php',
'PasswordError' => 'includes/User.php', 'PasswordError' => 'includes/User.php',
@ -258,6 +254,9 @@ $wgAutoloadLocalClasses = array(
# includes/actions # includes/actions
'CreditsAction' => 'includes/actions/CreditsAction.php', 'CreditsAction' => 'includes/actions/CreditsAction.php',
'DeletetrackbackAction' => 'includes/actions/DeletetrackbackAction.php', 'DeletetrackbackAction' => 'includes/actions/DeletetrackbackAction.php',
'HistoryAction' => 'includes/actions/HistoryAction.php',
'HistoryPage' => 'includes/actions/HistoryAction.php',
'HistoryPager' => 'includes/actions/HistoryAction.php',
'InfoAction' => 'includes/actions/InfoAction.php', 'InfoAction' => 'includes/actions/InfoAction.php',
'MarkpatrolledAction' => 'includes/actions/MarkpatrolledAction.php', 'MarkpatrolledAction' => 'includes/actions/MarkpatrolledAction.php',
'PurgeAction' => 'includes/actions/PurgeAction.php', 'PurgeAction' => 'includes/actions/PurgeAction.php',

View file

@ -5135,6 +5135,7 @@ $wgMaxRedirectLinksRetrieved = 500;
$wgActions = array( $wgActions = array(
'credits' => true, 'credits' => true,
'deletetrackback' => true, 'deletetrackback' => true,
'history' => true,
'info' => true, 'info' => true,
'markpatrolled' => true, 'markpatrolled' => true,
'purge' => true, 'purge' => true,

View file

@ -503,13 +503,6 @@ class MediaWiki {
} }
} }
break; break;
case 'history':
if ( $request->getFullRequestURL() == $title->getInternalURL( 'action=history' ) ) {
$output->setSquidMaxage( $wgSquidMaxage );
}
$history = new HistoryPage( $article );
$history->history();
break;
default: default:
if ( wfRunHooks( 'UnknownAction', array( $act, $article ) ) ) { if ( wfRunHooks( 'UnknownAction', array( $act, $article ) ) ) {
$output->showErrorPage( 'nosuchaction', 'nosuchactiontext' ); $output->showErrorPage( 'nosuchaction', 'nosuchactiontext' );

View file

@ -1,8 +1,8 @@
<?php <?php
/** /**
* Page history * Handles action=history.
*
* Split off from Article.php and Skin.php, 2003-12-22 * Split off from Article.php and Skin.php, 2003-12-22
*
* @file * @file
*/ */
@ -10,43 +10,26 @@
* This class handles printing the history page for an article. In order to * 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 * be efficient, it uses timestamps rather than offsets for paging, to avoid
* costly LIMIT,offset queries. * costly LIMIT,offset queries.
*
* Construct it by passing in an Article, and call $h->history() to print the
* history.
*
*/ */
class HistoryPage { class HistoryAction extends FormlessAction {
const DIR_PREV = 0; const DIR_PREV = 0;
const DIR_NEXT = 1; const DIR_NEXT = 1;
/** Contains the Article object. Passed on construction. */ public function getName() {
private $article; return 'history';
/** The $article title object. Found on construction. */ }
private $title;
/** Shortcut to the user Skin object. */ public function getRestriction() {
private $skin; return 'read';
}
/** /**
* Construct a new HistoryPage. * Get the Page object we are working on.
* *
* @param $article Article * @return Page
*/ */
function __construct( $article ) {
global $wgUser;
$this->article = $article;
$this->title = $article->getTitle();
$this->skin = $wgUser->getSkin();
$this->preCacheMessages();
}
/** Get the Article object we are working on. */
public function getArticle() { public function getArticle() {
return $this->article; return $this->page;
}
/** Get the Title object. */
public function getTitle() {
return $this->title;
} }
/** /**
@ -67,53 +50,56 @@ class HistoryPage {
* Print the history page for an article. * Print the history page for an article.
* @return nothing * @return nothing
*/ */
function history() { function onView() {
global $wgOut, $wgRequest, $wgScript; global $wgSquidMaxage, $wgScript;
/** $out = $this->getOutput();
* Allow client caching. $request = $this->getRequest();
*/
if ( $wgOut->checkLastModified( $this->article->getTouched() ) ) // Allow client caching.
if ( $out->checkLastModified( $this->page->getTouched() ) ) {
return; // Client cache fresh and headers sent, nothing more to do. return; // Client cache fresh and headers sent, nothing more to do.
}
if ( $request->getFullRequestURL() == $this->getTitle()->getInternalURL( 'action=history' ) ) {
$out->setSquidMaxage( $wgSquidMaxage );
}
wfProfileIn( __METHOD__ ); wfProfileIn( __METHOD__ );
$this->preCacheMessages();
// Setup page variables. // Setup page variables.
$wgOut->setPageTitle( wfMsg( 'history-title', $this->title->getPrefixedText() ) ); $out->setPageTitle( wfMsg( 'history-title', $this->getTitle()->getPrefixedText() ) );
$wgOut->setPageTitleActionText( wfMsg( 'history_short' ) ); $out->setRobotPolicy( 'noindex,nofollow' );
$wgOut->setArticleFlag( false ); $out->setFeedAppendQuery( 'action=history' );
$wgOut->setArticleRelated( true ); $out->addModules( array( 'mediawiki.legacy.history', 'mediawiki.action.history' ) );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
$wgOut->setSyndicated( true );
$wgOut->setFeedAppendQuery( 'action=history' );
$wgOut->addModules( array( 'mediawiki.legacy.history', 'mediawiki.action.history' ) );
// Creation of a subtitle link pointing to [[Special:Log]] // Creation of a subtitle link pointing to [[Special:Log]]
$logPage = SpecialPage::getTitleFor( 'Log' ); $logPage = SpecialPage::getTitleFor( 'Log' );
$logLink = $this->skin->link( $logLink = Linker::linkKnown(
$logPage, $logPage,
wfMsgHtml( 'viewpagelogs' ), wfMsgHtml( 'viewpagelogs' ),
array(), array(),
array( 'page' => $this->title->getPrefixedText() ), array( 'page' => $this->getTitle()->getPrefixedText() )
array( 'known', 'noclasses' )
); );
$wgOut->setSubtitle( $logLink ); $out->setSubtitle( $logLink );
// Handle atom/RSS feeds. // Handle atom/RSS feeds.
$feedType = $wgRequest->getVal( 'feed' ); $feedType = $request->getVal( 'feed' );
if ( $feedType ) { if ( $feedType ) {
wfProfileOut( __METHOD__ ); wfProfileOut( __METHOD__ );
return $this->feed( $feedType ); return $this->feed( $feedType );
} }
// Fail nicely if article doesn't exist. // Fail nicely if article doesn't exist.
if ( !$this->title->exists() ) { if ( !$this->getTitle()->exists() ) {
$wgOut->addWikiMsg( 'nohistory' ); $out->addWikiMsg( 'nohistory' );
# show deletion/move log if there is an entry # show deletion/move log if there is an entry
LogEventsList::showLogExtract( LogEventsList::showLogExtract(
$wgOut, $out,
array( 'delete', 'move' ), array( 'delete', 'move' ),
$this->title->getPrefixedText(), $this->getTitle()->getPrefixedText(),
'', '',
array( 'lim' => 10, array( 'lim' => 10,
'conds' => array( "log_action != 'revision'" ), 'conds' => array( "log_action != 'revision'" ),
@ -128,32 +114,32 @@ class HistoryPage {
/** /**
* Add date selector to quickly get to a certain time * Add date selector to quickly get to a certain time
*/ */
$year = $wgRequest->getInt( 'year' ); $year = $request->getInt( 'year' );
$month = $wgRequest->getInt( 'month' ); $month = $request->getInt( 'month' );
$tagFilter = $wgRequest->getVal( 'tagfilter' ); $tagFilter = $request->getVal( 'tagfilter' );
$tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter ); $tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter );
/** /**
* Option to show only revisions that have been (partially) hidden via RevisionDelete * Option to show only revisions that have been (partially) hidden via RevisionDelete
*/ */
if ( $wgRequest->getBool( 'deleted' ) ) { if ( $request->getBool( 'deleted' ) ) {
$conds = array( "rev_deleted != '0'" ); $conds = array( "rev_deleted != '0'" );
} else { } else {
$conds = array(); $conds = array();
} }
$checkDeleted = Xml::checkLabel( wfMsg( 'history-show-deleted' ), $checkDeleted = Xml::checkLabel( wfMsg( 'history-show-deleted' ),
'deleted', 'mw-show-deleted-only', $wgRequest->getBool( 'deleted' ) ) . "\n"; 'deleted', 'mw-show-deleted-only', $request->getBool( 'deleted' ) ) . "\n";
// Add the general form // Add the general form
$action = htmlspecialchars( $wgScript ); $action = htmlspecialchars( $wgScript );
$wgOut->addHTML( $out->addHTML(
"<form action=\"$action\" method=\"get\" id=\"mw-history-searchform\">" . "<form action=\"$action\" method=\"get\" id=\"mw-history-searchform\">" .
Xml::fieldset( Xml::fieldset(
wfMsg( 'history-fieldset-title' ), wfMsg( 'history-fieldset-title' ),
false, false,
array( 'id' => 'mw-history-search' ) array( 'id' => 'mw-history-search' )
) . ) .
Html::hidden( 'title', $this->title->getPrefixedDBKey() ) . "\n" . Html::hidden( 'title', $this->getTitle()->getPrefixedDBKey() ) . "\n" .
Html::hidden( 'action', 'history' ) . "\n" . Html::hidden( 'action', 'history' ) . "\n" .
Xml::dateMenu( $year, $month ) . '&#160;' . Xml::dateMenu( $year, $month ) . '&#160;' .
( $tagSelector ? ( implode( '&#160;', $tagSelector ) . '&#160;' ) : '' ) . ( $tagSelector ? ( implode( '&#160;', $tagSelector ) . '&#160;' ) : '' ) .
@ -162,16 +148,16 @@ class HistoryPage {
'</fieldset></form>' '</fieldset></form>'
); );
wfRunHooks( 'PageHistoryBeforeList', array( &$this->article ) ); wfRunHooks( 'PageHistoryBeforeList', array( &$this->page ) );
// Create and output the list. // Create and output the list.
$pager = new HistoryPager( $this, $year, $month, $tagFilter, $conds ); $pager = new HistoryPager( $this, $year, $month, $tagFilter, $conds );
$wgOut->addHTML( $out->addHTML(
$pager->getNavigationBar() . $pager->getNavigationBar() .
$pager->getBody() . $pager->getBody() .
$pager->getNavigationBar() $pager->getNavigationBar()
); );
$wgOut->preventClickjacking( $pager->getPreventClickjacking() ); $out->preventClickjacking( $pager->getPreventClickjacking() );
wfProfileOut( __METHOD__ ); wfProfileOut( __METHOD__ );
} }
@ -183,15 +169,15 @@ class HistoryPage {
* *
* @param $limit Integer: the limit number of revisions to get * @param $limit Integer: the limit number of revisions to get
* @param $offset Integer * @param $offset Integer
* @param $direction Integer: either HistoryPage::DIR_PREV or HistoryPage::DIR_NEXT * @param $direction Integer: either HistoryAction::DIR_PREV or HistoryAction::DIR_NEXT
* @return ResultWrapper * @return ResultWrapper
*/ */
function fetchRevisions( $limit, $offset, $direction ) { function fetchRevisions( $limit, $offset, $direction ) {
$dbr = wfGetDB( DB_SLAVE ); $dbr = wfGetDB( DB_SLAVE );
if ( $direction == HistoryPage::DIR_PREV ) { if ( $direction == self::DIR_PREV ) {
list( $dirs, $oper ) = array( "ASC", ">=" ); list( $dirs, $oper ) = array( "ASC", ">=" );
} else { /* $direction == HistoryPage::DIR_NEXT */ } else { /* $direction == self::DIR_NEXT */
list( $dirs, $oper ) = array( "DESC", "<=" ); list( $dirs, $oper ) = array( "DESC", "<=" );
} }
@ -201,7 +187,7 @@ class HistoryPage {
$offsets = array(); $offsets = array();
} }
$page_id = $this->title->getArticleID(); $page_id = $this->getTitle()->getArticleID();
return $dbr->select( 'revision', return $dbr->select( 'revision',
Revision::selectFields(), Revision::selectFields(),
@ -218,29 +204,29 @@ class HistoryPage {
* @param $type String: feed type * @param $type String: feed type
*/ */
function feed( $type ) { function feed( $type ) {
global $wgFeedClasses, $wgRequest, $wgFeedLimit; global $wgFeedClasses, $wgFeedLimit;
if ( !FeedUtils::checkFeedOutput( $type ) ) { if ( !FeedUtils::checkFeedOutput( $type ) ) {
return; return;
} }
$feed = new $wgFeedClasses[$type]( $feed = new $wgFeedClasses[$type](
$this->title->getPrefixedText() . ' - ' . $this->getTitle()->getPrefixedText() . ' - ' .
wfMsgForContent( 'history-feed-title' ), wfMsgForContent( 'history-feed-title' ),
wfMsgForContent( 'history-feed-description' ), wfMsgForContent( 'history-feed-description' ),
$this->title->getFullUrl( 'action=history' ) $this->getTitle()->getFullUrl( 'action=history' )
); );
// Get a limit on number of feed entries. Provide a sane default // Get a limit on number of feed entries. Provide a sane default
// of 10 if none is defined (but limit to $wgFeedLimit max) // of 10 if none is defined (but limit to $wgFeedLimit max)
$limit = $wgRequest->getInt( 'limit', 10 ); $limit = $this->getRequest()->getInt( 'limit', 10 );
if ( $limit > $wgFeedLimit || $limit < 1 ) { if ( $limit > $wgFeedLimit || $limit < 1 ) {
$limit = 10; $limit = 10;
} }
$items = $this->fetchRevisions( $limit, 0, HistoryPage::DIR_NEXT ); $items = $this->fetchRevisions( $limit, 0, self::DIR_NEXT );
// Generate feed elements enclosed between header and footer. // Generate feed elements enclosed between header and footer.
$feed->outHeader(); $feed->outHeader();
if ( $items ) { if ( $items->numRows() ) {
foreach ( $items as $row ) { foreach ( $items as $row ) {
$feed->outItem( $this->feedItem( $row ) ); $feed->outItem( $this->feedItem( $row ) );
} }
@ -251,14 +237,13 @@ class HistoryPage {
} }
function feedEmpty() { function feedEmpty() {
global $wgOut;
return new FeedItem( return new FeedItem(
wfMsgForContent( 'nohistory' ), wfMsgForContent( 'nohistory' ),
$wgOut->parse( wfMsgForContent( 'history-feed-empty' ) ), $this->getOutput()->parse( wfMsgForContent( 'history-feed-empty' ) ),
$this->title->getFullUrl(), $this->getTitle()->getFullUrl(),
wfTimestamp( TS_MW ), wfTimestamp( TS_MW ),
'', '',
$this->title->getTalkPage()->getFullUrl() $this->getTitle()->getTalkPage()->getFullUrl()
); );
} }
@ -272,10 +257,11 @@ class HistoryPage {
*/ */
function feedItem( $row ) { function feedItem( $row ) {
$rev = new Revision( $row ); $rev = new Revision( $row );
$rev->setTitle( $this->title ); $titleObj = $this->getTitle();
$rev->setTitle( $titleObj );
$text = FeedUtils::formatDiffRow( $text = FeedUtils::formatDiffRow(
$this->title, $titleObj,
$this->title->getPreviousRevisionID( $rev->getId() ), $titleObj->getPreviousRevisionID( $rev->getId() ),
$rev->getId(), $rev->getId(),
$rev->getTimestamp(), $rev->getTimestamp(),
$rev->getComment() $rev->getComment()
@ -296,10 +282,10 @@ class HistoryPage {
return new FeedItem( return new FeedItem(
$title, $title,
$text, $text,
$this->title->getFullUrl( 'diff=' . $rev->getId() . '&oldid=prev' ), $titleObj->getFullUrl( 'diff=' . $rev->getId() . '&oldid=prev' ),
$rev->getTimestamp(), $rev->getTimestamp(),
$rev->getUserText(), $rev->getUserText(),
$this->title->getTalkPage()->getFullUrl() $titleObj->getTalkPage()->getFullUrl()
); );
} }
} }
@ -308,14 +294,13 @@ class HistoryPage {
* @ingroup Pager * @ingroup Pager
*/ */
class HistoryPager extends ReverseChronologicalPager { class HistoryPager extends ReverseChronologicalPager {
public $lastRow = false, $counter, $historyPage, $title, $buttons, $conds; public $lastRow = false, $counter, $history, $buttons, $conds;
protected $oldIdChecked; protected $oldIdChecked;
protected $preventClickjacking = false; protected $preventClickjacking = false;
function __construct( $historyPage, $year = '', $month = '', $tagFilter = '', $conds = array() ) { function __construct( $history, $year = '', $month = '', $tagFilter = '', $conds = array() ) {
parent::__construct(); parent::__construct();
$this->historyPage = $historyPage; $this->history = $history;
$this->title = $this->historyPage->getTitle();
$this->tagFilter = $tagFilter; $this->tagFilter = $tagFilter;
$this->getDateCond( $year, $month ); $this->getDateCond( $year, $month );
$this->conds = $conds; $this->conds = $conds;
@ -323,11 +308,7 @@ class HistoryPager extends ReverseChronologicalPager {
// For hook compatibility... // For hook compatibility...
function getArticle() { function getArticle() {
return $this->historyPage->getArticle(); return $this->history->getArticle();
}
function getTitle() {
return $this->title;
} }
function getSqlComment() { function getSqlComment() {
@ -343,7 +324,7 @@ class HistoryPager extends ReverseChronologicalPager {
'tables' => array( 'revision' ), 'tables' => array( 'revision' ),
'fields' => Revision::selectFields(), 'fields' => Revision::selectFields(),
'conds' => array_merge( 'conds' => array_merge(
array( 'rev_page' => $this->title->getArticleID() ), array( 'rev_page' => $this->getTitle()->getArticleID() ),
$this->conds ), $this->conds ),
'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' ) ), 'join_conds' => array( 'tag_summary' => array( 'LEFT JOIN', 'ts_rev_id=rev_id' ) ),
@ -370,7 +351,7 @@ class HistoryPager extends ReverseChronologicalPager {
$firstInList = $this->counter == 1; $firstInList = $this->counter == 1;
$this->counter++; $this->counter++;
$s = $this->historyLine( $this->lastRow, $row, $s = $this->historyLine( $this->lastRow, $row,
$this->title->getNotificationTimestamp(), $latest, $firstInList ); $this->getTitle()->getNotificationTimestamp(), $latest, $firstInList );
} else { } else {
$s = ''; $s = '';
} }
@ -384,15 +365,15 @@ class HistoryPager extends ReverseChronologicalPager {
* @return string HTML output * @return string HTML output
*/ */
function getStartBody() { function getStartBody() {
global $wgScript, $wgUser, $wgOut; global $wgScript;
$this->lastRow = false; $this->lastRow = false;
$this->counter = 1; $this->counter = 1;
$this->oldIdChecked = 0; $this->oldIdChecked = 0;
$wgOut->wrapWikiMsg( "<div class='mw-history-legend'>\n$1\n</div>", 'histlegend' ); $this->getOutput()->wrapWikiMsg( "<div class='mw-history-legend'>\n$1\n</div>", 'histlegend' );
$s = Html::openElement( 'form', array( 'action' => $wgScript, $s = Html::openElement( 'form', array( 'action' => $wgScript,
'id' => 'mw-history-compare' ) ) . "\n"; 'id' => 'mw-history-compare' ) ) . "\n";
$s .= Html::hidden( 'title', $this->title->getPrefixedDbKey() ) . "\n"; $s .= Html::hidden( 'title', $this->getTitle()->getPrefixedDbKey() ) . "\n";
$s .= Html::hidden( 'action', 'historysubmit' ) . "\n"; $s .= Html::hidden( 'action', 'historysubmit' ) . "\n";
$s .= '<div>' . $this->submitButton( wfMsg( 'compareselectedversions' ), $s .= '<div>' . $this->submitButton( wfMsg( 'compareselectedversions' ),
@ -404,7 +385,7 @@ class HistoryPager extends ReverseChronologicalPager {
+ Linker::tooltipAndAccesskeyAttribs( 'compareselectedversions' ) + Linker::tooltipAndAccesskeyAttribs( 'compareselectedversions' )
) . "\n"; ) . "\n";
if ( $wgUser->isAllowed( 'deleterevision' ) ) { if ( $this->getUser()->isAllowed( 'deleterevision' ) ) {
$s .= $this->getRevisionButton( 'revisiondelete', 'showhideselectedversions' ); $s .= $this->getRevisionButton( 'revisiondelete', 'showhideselectedversions' );
} }
$this->buttons .= '</div>'; $this->buttons .= '</div>';
@ -445,7 +426,7 @@ class HistoryPager extends ReverseChronologicalPager {
} }
$this->counter++; $this->counter++;
$s = $this->historyLine( $this->lastRow, $next, $s = $this->historyLine( $this->lastRow, $next,
$this->title->getNotificationTimestamp(), $latest, $firstInList ); $this->getTitle()->getNotificationTimestamp(), $latest, $firstInList );
} else { } else {
$s = ''; $s = '';
} }
@ -489,9 +470,8 @@ class HistoryPager extends ReverseChronologicalPager {
function historyLine( $row, $next, $notificationtimestamp = false, function historyLine( $row, $next, $notificationtimestamp = false,
$latest = false, $firstInList = false ) $latest = false, $firstInList = false )
{ {
global $wgUser, $wgLang;
$rev = new Revision( $row ); $rev = new Revision( $row );
$rev->setTitle( $this->title ); $rev->setTitle( $this->getTitle() );
$curlink = $this->curLink( $rev, $latest ); $curlink = $this->curLink( $rev, $latest );
$lastlink = $this->lastLink( $rev, $next ); $lastlink = $this->lastLink( $rev, $next );
@ -499,7 +479,7 @@ class HistoryPager extends ReverseChronologicalPager {
$histLinks = Html::rawElement( $histLinks = Html::rawElement(
'span', 'span',
array( 'class' => 'mw-history-histlinks' ), array( 'class' => 'mw-history-histlinks' ),
'(' . $curlink . $this->historyPage->message['pipe-separator'] . $lastlink . ') ' '(' . $curlink . $this->history->message['pipe-separator'] . $lastlink . ') '
); );
$s = $histLinks . $diffButtons; $s = $histLinks . $diffButtons;
@ -508,7 +488,7 @@ class HistoryPager extends ReverseChronologicalPager {
$del = ''; $del = '';
// Show checkboxes for each revision // Show checkboxes for each revision
if ( $wgUser->isAllowed( 'deleterevision' ) ) { if ( $this->getUser()->isAllowed( 'deleterevision' ) ) {
$this->preventClickjacking(); $this->preventClickjacking();
// If revision was hidden from sysops, disable the checkbox // If revision was hidden from sysops, disable the checkbox
if ( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) { if ( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
@ -519,15 +499,15 @@ class HistoryPager extends ReverseChronologicalPager {
array( 'name' => 'ids[' . $rev->getId() . ']' ) ); array( 'name' => 'ids[' . $rev->getId() . ']' ) );
} }
// User can only view deleted revisions... // User can only view deleted revisions...
} elseif ( $rev->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) { } elseif ( $rev->getVisibility() && $this->getUser()->isAllowed( 'deletedhistory' ) ) {
// If revision was hidden from sysops, disable the link // If revision was hidden from sysops, disable the link
if ( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) { if ( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
$cdel = $this->getSkin()->revDeleteLinkDisabled( false ); $cdel = Linker::revDeleteLinkDisabled( false );
// Otherwise, show the link... // Otherwise, show the link...
} else { } else {
$query = array( 'type' => 'revision', $query = array( 'type' => 'revision',
'target' => $this->title->getPrefixedDbkey(), 'ids' => $rev->getId() ); 'target' => $this->getTitle()->getPrefixedDbkey(), 'ids' => $rev->getId() );
$del .= $this->getSkin()->revDeleteLink( $query, $del .= Linker::revDeleteLink( $query,
$rev->isDeleted( Revision::DELETED_RESTRICTED ), false ); $rev->isDeleted( Revision::DELETED_RESTRICTED ), false );
} }
} }
@ -535,12 +515,12 @@ class HistoryPager extends ReverseChronologicalPager {
$s .= " $del "; $s .= " $del ";
} }
$dirmark = $wgLang->getDirMark(); $dirmark = $this->getLang()->getDirMark();
$s .= " $link"; $s .= " $link";
$s .= $dirmark; $s .= $dirmark;
$s .= " <span class='history-user'>" . $s .= " <span class='history-user'>" .
$this->getSkin()->revUserTools( $rev, true ) . "</span>"; Linker::revUserTools( $rev, true ) . "</span>";
$s .= $dirmark; $s .= $dirmark;
if ( $rev->isMinor() ) { if ( $rev->isMinor() ) {
@ -548,10 +528,10 @@ class HistoryPager extends ReverseChronologicalPager {
} }
if ( !is_null( $size = $rev->getSize() ) && !$rev->isDeleted( Revision::DELETED_TEXT ) ) { if ( !is_null( $size = $rev->getSize() ) && !$rev->isDeleted( Revision::DELETED_TEXT ) ) {
$s .= ' ' . $this->getSkin()->formatRevisionSize( $size ); $s .= ' ' . Linker::formatRevisionSize( $size );
} }
$s .= $this->getSkin()->revComment( $rev, false, true ); $s .= Linker::revComment( $rev, false, true );
if ( $notificationtimestamp && ( $row->rev_timestamp >= $notificationtimestamp ) ) { if ( $notificationtimestamp && ( $row->rev_timestamp >= $notificationtimestamp ) ) {
$s .= ' <span class="updatedmarker">' . wfMsgHtml( 'updatedmarker' ) . '</span>'; $s .= ' <span class="updatedmarker">' . wfMsgHtml( 'updatedmarker' ) . '</span>';
@ -561,13 +541,13 @@ class HistoryPager extends ReverseChronologicalPager {
# Rollback and undo links # Rollback and undo links
if ( !is_null( $next ) && is_object( $next ) ) { if ( !is_null( $next ) && is_object( $next ) ) {
if ( $latest && $this->title->userCan( 'rollback' ) && $this->title->userCan( 'edit' ) ) { if ( $latest && $this->getTitle()->userCan( 'rollback' ) && $this->getTitle()->userCan( 'edit' ) ) {
$this->preventClickjacking(); $this->preventClickjacking();
$tools[] = '<span class="mw-rollback-link">' . $tools[] = '<span class="mw-rollback-link">' .
$this->getSkin()->buildRollbackLink( $rev ) . '</span>'; Linker::buildRollbackLink( $rev ) . '</span>';
} }
if ( $this->title->quickUserCan( 'edit' ) if ( $this->getTitle()->quickUserCan( 'edit' )
&& !$rev->isDeleted( Revision::DELETED_TEXT ) && !$rev->isDeleted( Revision::DELETED_TEXT )
&& !$next->rev_deleted & Revision::DELETED_TEXT ) && !$next->rev_deleted & Revision::DELETED_TEXT )
{ {
@ -575,23 +555,22 @@ class HistoryPager extends ReverseChronologicalPager {
$undoTooltip = $latest $undoTooltip = $latest
? array( 'title' => wfMsg( 'tooltip-undo' ) ) ? array( 'title' => wfMsg( 'tooltip-undo' ) )
: array(); : array();
$undolink = $this->getSkin()->link( $undolink = Linker::linkKnown(
$this->title, $this->getTitle(),
wfMsgHtml( 'editundo' ), wfMsgHtml( 'editundo' ),
$undoTooltip, $undoTooltip,
array( array(
'action' => 'edit', 'action' => 'edit',
'undoafter' => $next->rev_id, 'undoafter' => $next->rev_id,
'undo' => $rev->getId() 'undo' => $rev->getId()
), )
array( 'known', 'noclasses' )
); );
$tools[] = "<span class=\"mw-history-undo\">{$undolink}</span>"; $tools[] = "<span class=\"mw-history-undo\">{$undolink}</span>";
} }
} }
if ( $tools ) { if ( $tools ) {
$s .= ' (' . $wgLang->pipeList( $tools ) . ')'; $s .= ' (' . $this->getLang()->pipeList( $tools ) . ')';
} }
# Tags # Tags
@ -616,16 +595,14 @@ class HistoryPager extends ReverseChronologicalPager {
* @return String * @return String
*/ */
function revLink( $rev ) { function revLink( $rev ) {
global $wgLang; $date = $this->getLang()->timeanddate( wfTimestamp( TS_MW, $rev->getTimestamp() ), true );
$date = $wgLang->timeanddate( wfTimestamp( TS_MW, $rev->getTimestamp() ), true );
$date = htmlspecialchars( $date ); $date = htmlspecialchars( $date );
if ( $rev->userCan( Revision::DELETED_TEXT ) ) { if ( $rev->userCan( Revision::DELETED_TEXT ) ) {
$link = $this->getSkin()->link( $link = Linker::linkKnown(
$this->title, $this->getTitle(),
$date, $date,
array(), array(),
array( 'oldid' => $rev->getId() ), array( 'oldid' => $rev->getId() )
array( 'known', 'noclasses' )
); );
} else { } else {
$link = $date; $link = $date;
@ -644,19 +621,18 @@ class HistoryPager extends ReverseChronologicalPager {
* @return String * @return String
*/ */
function curLink( $rev, $latest ) { function curLink( $rev, $latest ) {
$cur = $this->historyPage->message['cur']; $cur = $this->history->message['cur'];
if ( $latest || !$rev->userCan( Revision::DELETED_TEXT ) ) { if ( $latest || !$rev->userCan( Revision::DELETED_TEXT ) ) {
return $cur; return $cur;
} else { } else {
return $this->getSkin()->link( return Linker::linkKnown(
$this->title, $this->getTitle(),
$cur, $cur,
array(), array(),
array( array(
'diff' => $this->title->getLatestRevID(), 'diff' => $this->getTitle()->getLatestRevID(),
'oldid' => $rev->getId() 'oldid' => $rev->getId()
), )
array( 'known', 'noclasses' )
); );
} }
} }
@ -669,7 +645,7 @@ class HistoryPager extends ReverseChronologicalPager {
* @return String * @return String
*/ */
function lastLink( $prevRev, $next ) { function lastLink( $prevRev, $next ) {
$last = $this->historyPage->message['last']; $last = $this->history->message['last'];
# $next may either be a Row, null, or "unkown" # $next may either be a Row, null, or "unkown"
$nextRev = is_object( $next ) ? new Revision( $next ) : $next; $nextRev = is_object( $next ) ? new Revision( $next ) : $next;
if ( is_null( $next ) ) { if ( is_null( $next ) ) {
@ -677,30 +653,28 @@ class HistoryPager extends ReverseChronologicalPager {
return $last; return $last;
} elseif ( $next === 'unknown' ) { } elseif ( $next === 'unknown' ) {
# Next row probably exists but is unknown, use an oldid=prev link # Next row probably exists but is unknown, use an oldid=prev link
return $this->getSkin()->link( return Linker::link(
$this->title, $this->getTitle(),
$last, $last,
array(), array(),
array( array(
'diff' => $prevRev->getId(), 'diff' => $prevRev->getId(),
'oldid' => 'prev' 'oldid' => 'prev'
), )
array( 'known', 'noclasses' )
); );
} elseif ( !$prevRev->userCan( Revision::DELETED_TEXT ) } elseif ( !$prevRev->userCan( Revision::DELETED_TEXT )
|| !$nextRev->userCan( Revision::DELETED_TEXT ) ) || !$nextRev->userCan( Revision::DELETED_TEXT ) )
{ {
return $last; return $last;
} else { } else {
return $this->getSkin()->link( return Linker::linkKnown(
$this->title, $this->getTitle(),
$last, $last,
array(), array(),
array( array(
'diff' => $prevRev->getId(), 'diff' => $prevRev->getId(),
'oldid' => $next->rev_id 'oldid' => $next->rev_id
), )
array( 'known', 'noclasses' )
); );
} }
} }
@ -771,5 +745,12 @@ class HistoryPager extends ReverseChronologicalPager {
/** /**
* Backwards-compatibility aliases * Backwards-compatibility aliases
*/ */
class PageHistory extends HistoryPage {} class HistoryPage extends HistoryAction {
class PageHistoryPager extends HistoryPager {} public function __construct( Page $article ) { # Just to make it public
parent::__construct( $article );
}
public function history() {
$this->onView();
}
}