Cenarium has uploaded a new change for review.
https://gerrit.wikimedia.org/r/254640
Change subject: Add user and previous rev to HistoryRevisionTools, and user to
DiffRevisionTools
......................................................................
Add user and previous rev to HistoryRevisionTools, and user to DiffRevisionTools
The next revision in the page history isn't necessarily the previous
revision (due to selective undeletions, history merges, etc). This
passes the next revision to HistoryRevisionTools so extensions can check
if needed. Also, it passes the user to this hook and DiffRevisionTools
to avoid use of wgUser or having to retrieve context.
Change-Id: Ibc68f19040eebe3614e07f753f26bbfd376ae28d
---
M docs/hooks.txt
M includes/actions/HistoryAction.php
M includes/diff/DifferenceEngine.php
3 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/40/254640/1
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 7c79e72..ec1a8e7 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1094,6 +1094,7 @@
$newRev: Revision object of the "new" revision
&$links: Array of HTML links
$oldRev: Revision object of the "old" revision (may be null)
+$user: Current user object
'DiffViewHeader': Called before diff display
$diff: DifferenceEngine object that's calling
@@ -1554,6 +1555,8 @@
page history view, i.e. undo, rollback, etc.
$rev: Revision object
&$links: Array of HTML links
+$prevRev: Revision object, next in line in page history, or null
+$user: Current user object
'HTMLFileCache::useFileCache': Override whether a page should be cached in file
cache.
diff --git a/includes/actions/HistoryAction.php
b/includes/actions/HistoryAction.php
index a81adf9..ec81cb9 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -735,7 +735,7 @@
}
}
// Allow extension to add their own links here
- Hooks::run( 'HistoryRevisionTools', array( $rev, &$tools ) );
+ Hooks::run( 'HistoryRevisionTools', array( $rev, &$tools,
$prevRev, $user ) );
if ( $tools ) {
$s2 .= ' ' . $this->msg( 'parentheses' )->rawParams(
$lang->pipeList( $tools ) )->escaped();
diff --git a/includes/diff/DifferenceEngine.php
b/includes/diff/DifferenceEngine.php
index ae610fa..93f0f6c 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -388,7 +388,8 @@
$rdel = $this->revisionDeleteLink( $this->mNewRev );
# Allow extensions to define their own revision tools
- Hooks::run( 'DiffRevisionTools', array( $this->mNewRev,
&$revisionTools, $this->mOldRev ) );
+ Hooks::run( 'DiffRevisionTools',
+ array( $this->mNewRev, &$revisionTools, $this->mOldRev,
$user ) );
$formattedRevisionTools = array();
// Put each one in parentheses (poor man's button)
foreach ( $revisionTools as $key => $tool ) {
--
To view, visit https://gerrit.wikimedia.org/r/254640
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc68f19040eebe3614e07f753f26bbfd376ae28d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cenarium <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
