jenkins-bot has submitted this change and it was merged.
Change subject: Require $user parameter in DataOutputFormatter::formatOutput()
......................................................................
Require $user parameter in DataOutputFormatter::formatOutput()
All callers already pass it.
Change-Id: Ic99893f53d6379a3fbbc2a45193e6804264ff7b7
---
M includes/DataOutputFormatter.php
1 file changed, 2 insertions(+), 7 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/DataOutputFormatter.php b/includes/DataOutputFormatter.php
index 01d62d1..bee304e 100644
--- a/includes/DataOutputFormatter.php
+++ b/includes/DataOutputFormatter.php
@@ -17,18 +17,13 @@
*
* @param EchoNotification $notification
* @param string|bool $format specifify output format, false to not
format any notifications
- * @param User|null $user the target user viewing the notification
+ * @param User $user the target user viewing the notification
* @return array
*/
- public static function formatOutput( EchoNotification $notification,
$format = false, User $user = null ) {
+ public static function formatOutput( EchoNotification $notification,
$format = false, User $user ) {
$event = $notification->getEvent();
$timestamp = $notification->getTimestamp();
$utcTimestampUnix = wfTimestamp( TS_UNIX, $timestamp );
-
- // Default to notification user if user is not specified
- if ( !$user ) {
- $user = $notification->getUser();
- }
if ( $notification->getBundleBase() &&
$notification->getBundleDisplayHash() ) {
$event->setBundleHash(
$notification->getBundleDisplayHash() );
--
To view, visit https://gerrit.wikimedia.org/r/248901
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic99893f53d6379a3fbbc2a45193e6804264ff7b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
