jenkins-bot has submitted this change and it was merged.
Change subject: Invalid argument supplied for foreach() in BasicFormatter.php
......................................................................
Invalid argument supplied for foreach() in BasicFormatter.php
bug: 52897
Change-Id: I28f447af75f699d4bd7d4d045f030e70cea437d6
---
M formatters/BasicFormatter.php
1 file changed, 10 insertions(+), 7 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/formatters/BasicFormatter.php b/formatters/BasicFormatter.php
index 662f943..5c7ed92 100644
--- a/formatters/BasicFormatter.php
+++ b/formatters/BasicFormatter.php
@@ -57,7 +57,7 @@
parent::__construct( $params );
// Set up default params if any are missing
- $params += $this->getDefaultParams();
+ $params = $this->setDefaultParams( $params );
// Title for archive page
$this->title = array(
@@ -101,15 +101,13 @@
}
/**
- * Internal function that returns notification default params
- *
+ * Internal function for setting notification default params
+ * @param $params array
* @return array
*/
- protected function getDefaultParams() {
- return array(
+ protected function setDefaultParams( $params ) {
+ $params += array(
'title-params' => array(),
- 'flyout-message' => $this->title['message'],
- 'flyout-params' => $this->title['params'],
'bundle-message' => '',
'bundle-params' => array(),
'payload' => array(),
@@ -121,6 +119,11 @@
'email-body-batch-bundle-params' => array(),
'icon' => 'placeholder'
);
+
+ // default flyout-message to title-message if not defined
+ $params += array ( 'flyout-message' =>
$params['title-message'], 'flyout-params' => $params['title-params'] );
+
+ return $params;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/79301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28f447af75f699d4bd7d4d045f030e70cea437d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
Gerrit-Reviewer: EBernhardson (WMF) <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
