Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84143
Change subject: Always pass user to LogPage::addEntry
......................................................................
Always pass user to LogPage::addEntry
This avoids getting $wgUser in LogPage::addEntry
Change-Id: Ie105cef4ebc3d69aeaef5ee40ce6ee0087a74c69
---
M includes/Title.php
M includes/revisiondelete/RevisionDeleteAbstracts.php
M includes/specials/SpecialBlock.php
M includes/specials/SpecialImport.php
M includes/specials/SpecialMergeHistory.php
M includes/specials/SpecialUnblock.php
6 files changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/43/84143/1
diff --git a/includes/Title.php b/includes/Title.php
index 734e009..3ad76b9 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -3694,7 +3694,7 @@
$comment .= wfMessage( 'colon-separator'
)->inContentLanguage()->text() . $reason;
}
// @todo FIXME: $params?
- $log->addEntry( 'move_prot', $nt, $comment, array(
$this->getPrefixedText() ) );
+ $log->addEntry( 'move_prot', $nt, $comment, array(
$this->getPrefixedText() ), $wgUser );
}
# Update watchlists
diff --git a/includes/revisiondelete/RevisionDeleteAbstracts.php
b/includes/revisiondelete/RevisionDeleteAbstracts.php
index 9ace35a..d822d09 100644
--- a/includes/revisiondelete/RevisionDeleteAbstracts.php
+++ b/includes/revisiondelete/RevisionDeleteAbstracts.php
@@ -203,7 +203,7 @@
// Actually add the deletion log entry
$log = new LogPage( $logType );
$logid = $log->addEntry( $this->getLogAction(),
$params['title'],
- $params['comment'], $logParams );
+ $params['comment'], $logParams, $this->getUser() );
// Allow for easy searching of deletion log items for
revision/log items
$log->addRelations( $field, $params['ids'], $logid );
$log->addRelations( 'target_author_id', $params['authorIds'],
$logid );
diff --git a/includes/specials/SpecialBlock.php
b/includes/specials/SpecialBlock.php
index 6ba009a..3b73a37 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -772,7 +772,8 @@
$logaction,
Title::makeTitle( NS_USER, $target ),
$data['Reason'][0],
- $logParams
+ $logParams,
+ $performer
);
# Relate log ID to block IDs (bug 25763)
$blockIds = array_merge( array( $status['id'] ),
$status['autoIds'] );
diff --git a/includes/specials/SpecialImport.php
b/includes/specials/SpecialImport.php
index 0d54bb3..d7d860d 100644
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -478,7 +478,7 @@
if ( $this->reason ) {
$detail .= $this->msg(
'colon-separator' )->inContentLanguage()->text() . $this->reason;
}
- $log->addEntry( 'upload', $title, $detail );
+ $log->addEntry( 'upload', $title, $detail,
array(), $this->getUser() );
} else {
$interwiki = '[[:' . $this->mInterwiki . ':' .
$origTitle->getPrefixedText() . ']]';
@@ -487,7 +487,7 @@
if ( $this->reason ) {
$detail .= $this->msg(
'colon-separator' )->inContentLanguage()->text() . $this->reason;
}
- $log->addEntry( 'interwiki', $title, $detail );
+ $log->addEntry( 'interwiki', $title, $detail,
array(), $this->getUser() );
}
$comment = $detail; // quick
diff --git a/includes/specials/SpecialMergeHistory.php
b/includes/specials/SpecialMergeHistory.php
index 2a86fca..fb5ea65 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -417,7 +417,7 @@
$log = new LogPage( 'merge' );
$log->addEntry(
'merge', $targetTitle, $this->mComment,
- array( $destTitle->getPrefixedText(), $timestampLimit )
+ array( $destTitle->getPrefixedText(), $timestampLimit
), $this->getUser()
);
$this->getOutput()->addWikiMsg( 'mergehistory-success',
diff --git a/includes/specials/SpecialUnblock.php
b/includes/specials/SpecialUnblock.php
index 4da5155..ca93b6d 100644
--- a/includes/specials/SpecialUnblock.php
+++ b/includes/specials/SpecialUnblock.php
@@ -211,7 +211,7 @@
# Make log entry
$log = new LogPage( 'block' );
- $log->addEntry( 'unblock', $page, $data['Reason'] );
+ $log->addEntry( 'unblock', $page, $data['Reason'], array(),
$performer );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/84143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie105cef4ebc3d69aeaef5ee40ce6ee0087a74c69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
