From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- includes/actions/HistoryAction.php | 59 ++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 24 deletions(-) (limited to 'includes/actions/HistoryAction.php') diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php index 8522e560..dcd77415 100644 --- a/includes/actions/HistoryAction.php +++ b/includes/actions/HistoryAction.php @@ -67,8 +67,7 @@ class HistoryAction extends FormlessAction { } /** - * Get the Article object we are working on. - * @return Page + * @return WikiPage|Article|ImagePage|CategoryPage|Page The Article object we are working on. */ public function getArticle() { return $this->page; @@ -102,8 +101,6 @@ class HistoryAction extends FormlessAction { return; // Client cache fresh and headers sent, nothing more to do. } - wfProfileIn( __METHOD__ ); - $this->preCacheMessages(); $config = $this->context->getConfig(); @@ -131,7 +128,6 @@ class HistoryAction extends FormlessAction { $feedType = $request->getVal( 'feed' ); if ( $feedType ) { $this->feed( $feedType ); - wfProfileOut( __METHOD__ ); return; } @@ -151,7 +147,6 @@ class HistoryAction extends FormlessAction { 'msgKey' => array( 'moveddeleted-notice' ) ) ); - wfProfileOut( __METHOD__ ); return; } @@ -196,11 +191,15 @@ class HistoryAction extends FormlessAction { ) . ' ' . ( $tagSelector ? ( implode( ' ', $tagSelector ) . ' ' ) : '' ) . $checkDeleted . - Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) . "\n" . + Html::submitButton( + $this->msg( 'allpagessubmit' )->text(), + array(), + array( 'mw-ui-progressive' ) + ) . "\n" . '' ); - wfRunHooks( 'PageHistoryBeforeList', array( &$this->page, $this->getContext() ) ); + Hooks::run( 'PageHistoryBeforeList', array( &$this->page, $this->getContext() ) ); // Create and output the list. $pager = new HistoryPager( $this, $year, $month, $tagFilter, $conds ); @@ -211,7 +210,6 @@ class HistoryAction extends FormlessAction { ); $out->preventClickjacking( $pager->getPreventClickjacking() ); - wfProfileOut( __METHOD__ ); } /** @@ -416,7 +414,7 @@ class HistoryPager extends ReverseChronologicalPager { $queryInfo['options'], $this->tagFilter ); - wfRunHooks( 'PageHistoryPager::getQueryInfo', array( &$this, &$queryInfo ) ); + Hooks::run( 'PageHistoryPager::getQueryInfo', array( &$this, &$queryInfo ) ); return $queryInfo; } @@ -481,20 +479,28 @@ class HistoryPager extends ReverseChronologicalPager { 'id' => 'mw-history-compare' ) ) . "\n"; $s .= Html::hidden( 'title', $this->getTitle()->getPrefixedDBkey() ) . "\n"; $s .= Html::hidden( 'action', 'historysubmit' ) . "\n"; + $s .= Html::hidden( 'type', 'revision' ) . "\n"; // Button container stored in $this->buttons for re-use in getEndBody() $this->buttons = '
'; $className = 'historysubmit mw-history-compareselectedversions-button'; - if ( $this->getConfig()->get( 'UseMediaWikiUIEverywhere' ) ) { - $className .= ' mw-ui-button mw-ui-constructive'; - } + $attrs = array( 'class' => $className ) + + Linker::tooltipAndAccesskeyAttribs( 'compareselectedversions' ); $this->buttons .= $this->submitButton( $this->msg( 'compareselectedversions' )->text(), - array( 'class' => $className ) - + Linker::tooltipAndAccesskeyAttribs( 'compareselectedversions' ) + $attrs ) . "\n"; - if ( $this->getUser()->isAllowed( 'deleterevision' ) ) { - $this->buttons .= $this->getRevisionButton( 'revisiondelete', 'showhideselectedversions' ); + $user = $this->getUser(); + $actionButtons = ''; + if ( $user->isAllowed( 'deleterevision' ) ) { + $actionButtons .= $this->getRevisionButton( 'revisiondelete', 'showhideselectedversions' ); + } + if ( ChangeTags::showTagEditingUI( $user ) ) { + $actionButtons .= $this->getRevisionButton( 'editchangetags', 'history-edit-tags' ); + } + if ( $actionButtons ) { + $this->buttons .= Xml::tags( 'div', array( 'class' => + 'mw-history-revisionactions' ), $actionButtons ); } $this->buttons .= '
'; @@ -561,7 +567,7 @@ class HistoryPager extends ReverseChronologicalPager { function submitButton( $message, $attributes = array() ) { # Disable submit button if history has 1 revision only if ( $this->getNumRows() > 1 ) { - return Xml::submitButton( $message, $attributes ); + return Html::submitButton( $message, $attributes ); } else { return ''; } @@ -610,11 +616,15 @@ class HistoryPager extends ReverseChronologicalPager { $del = ''; $user = $this->getUser(); - // Show checkboxes for each revision - if ( $user->isAllowed( 'deleterevision' ) ) { + $canRevDelete = $user->isAllowed( 'deleterevision' ); + $showTagEditUI = ChangeTags::showTagEditingUI( $user ); + // Show checkboxes for each revision, to allow for revision deletion and + // change tags + if ( $canRevDelete || $showTagEditUI ) { $this->preventClickjacking(); - // If revision was hidden from sysops, disable the checkbox - if ( !$rev->userCan( Revision::DELETED_RESTRICTED, $user ) ) { + // If revision was hidden from sysops and we don't need the checkbox + // for anything else, disable it + if ( !$showTagEditUI && !$rev->userCan( Revision::DELETED_RESTRICTED, $user ) ) { $del = Xml::check( 'deleterevisions', false, array( 'disabled' => 'disabled' ) ); // Otherwise, enable the checkbox... } else { @@ -708,7 +718,7 @@ class HistoryPager extends ReverseChronologicalPager { } } // Allow extension to add their own links here - wfRunHooks( 'HistoryRevisionTools', array( $rev, &$tools ) ); + Hooks::run( 'HistoryRevisionTools', array( $rev, &$tools ) ); if ( $tools ) { $s2 .= ' ' . $this->msg( 'parentheses' )->rawParams( $lang->pipeList( $tools ) )->escaped(); @@ -726,7 +736,7 @@ class HistoryPager extends ReverseChronologicalPager { $s .= ' . . ' . $s2; } - wfRunHooks( 'PageHistoryLineEnding', array( $this, &$row, &$s, &$classes ) ); + Hooks::run( 'PageHistoryLineEnding', array( $this, &$row, &$s, &$classes ) ); $attribs = array(); if ( $classes ) { @@ -899,4 +909,5 @@ class HistoryPager extends ReverseChronologicalPager { function getPreventClickjacking() { return $this->preventClickjacking; } + } -- cgit v1.2.3-54-g00ecf