jenkins-bot has submitted this change and it was merged.
Change subject: Typo fix + conditional fix
......................................................................
Typo fix + conditional fix
bundleTitle['message'] defaults to empty string, it would never
be null, should just check if the string is empty
Change-Id: I6b9dd8b8a94fed114c0799004848daed472daf3a
---
M formatters/BasicFormatter.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/formatters/BasicFormatter.php b/formatters/BasicFormatter.php
index e3c226c..e4ee214 100644
--- a/formatters/BasicFormatter.php
+++ b/formatters/BasicFormatter.php
@@ -134,7 +134,7 @@
}
/**
- * Apply some custom change beforing formatting, child class
overwriting this method
+ * Apply some custom change before formatting, child class overwriting
this method
* should always invoke a call to the parent method unless child class
wants to overwrite
* the default completely
*
@@ -145,7 +145,7 @@
protected function applyChangeBeforeFormatting( EchoEvent $event, User
$user, $type ) {
// Use the bundle message if use-bundle is true and there is a
bundle message
$this->generateBundleData( $event, $user, $type );
- if ( $this->bundleData['use-bundle'] && isset(
$this->bundleTitle['message'] ) ) {
+ if ( $this->bundleData['use-bundle'] &&
$this->bundleTitle['message'] ) {
$this->title = $this->flyoutTitle = $this->bundleTitle;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/86738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b9dd8b8a94fed114c0799004848daed472daf3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu <bs...@wikimedia.org>
Gerrit-Reviewer: EBernhardson (WMF) <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Matthias Mullie <mmul...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
