jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused global variable and update function return type
......................................................................
Remove unused global variable and update function return type
Change-Id: I2f6e0388c2d1218e72b70a69b429884b39dc096f
---
M formatters/BasicFormatter.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
AzaToth: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/formatters/BasicFormatter.php b/formatters/BasicFormatter.php
index b5cd76f..cedcfb1 100644
--- a/formatters/BasicFormatter.php
+++ b/formatters/BasicFormatter.php
@@ -143,7 +143,7 @@
* @return array|string
*/
public function format( $event, $user, $type ) {
- global $wgEchoNotificationCategories, $wgExtensionAssetsPath,
$wgEchoNotificationIcons;
+ global $wgExtensionAssetsPath, $wgEchoNotificationIcons;
// Use the bundle message if use-bundle is true and there is a
bundle message
$this->generateBundleData( $event, $user, $type );
@@ -259,7 +259,7 @@
* @param $event EchoEvent
* @param $user User
* @param $type
- * @return string
+ * @return array
*/
protected function formatEmail( $event, $user, $type ) {
$subject = $this->formatFragment( $this->email['subject'],
$event, $user )->text();
--
To view, visit https://gerrit.wikimedia.org/r/69249
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2f6e0388c2d1218e72b70a69b429884b39dc096f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: AzaToth <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
