jenkins-bot has submitted this change and it was merged.

Change subject: Don't assume $data['topic-title'] exists for every event
......................................................................


Don't assume $data['topic-title'] exists for every event

e.g. edit-title doesn't set topic-title

Change-Id: I5d3032b0d7ada6b025581b2971a8a4f53ec64891
---
M includes/Notifications/Controller.php
1 file changed, 3 insertions(+), 4 deletions(-)

Approvals:
  Bsitu: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Notifications/Controller.php 
b/includes/Notifications/Controller.php
index 20efe36..719a9fd 100644
--- a/includes/Notifications/Controller.php
+++ b/includes/Notifications/Controller.php
@@ -64,7 +64,6 @@
                $extraData = array();
 
                $revision = $data['revision'];
-               $topicTitle = $data['topic-title'];
                $topicWorkflow = $data['topic-workflow'];
 
                $extraData['revision-id'] = $revision->getRevisionId();
@@ -77,7 +76,7 @@
                                $extraData += array(
                                        'reply-to' => $replyToPost->getPostId(),
                                        'content' => $revision->getContent(),
-                                       'topic-title' => $topicTitle,
+                                       'topic-title' => $data['topic-title'],
                                );
                        break;
                        case 'flow-topic-renamed':
@@ -89,7 +88,7 @@
                        case 'flow-post-edited':
                                $extraData += array(
                                        'content' => $revision->getContent(),
-                                       'topic-title' => $topicTitle,
+                                       'topic-title' => $data['topic-title'],
                                );
                        break;
                }
@@ -109,7 +108,7 @@
                                        'title' => $title,
                                        'user' => $user,
                                        'post' => $revision,
-                                       'topic-title' => $topicTitle,
+                                       'topic-title' => $data['topic-title'],
                                        'topic-workflow' => $topicWorkflow,
                                ) )
                        );

-- 
To view, visit https://gerrit.wikimedia.org/r/98548
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d3032b0d7ada6b025581b2971a8a4f53ec64891
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <mmul...@wikimedia.org>
Gerrit-Reviewer: Bsitu <bs...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to