jenkins-bot has submitted this change and it was merged.
Change subject: (bug 60906) Truncate content before storing event into DB
......................................................................
(bug 60906) Truncate content before storing event into DB
Because the event_extra column is limited in size, so we don't want
to store too much ;)
(cherry picked from c3127a5ae37d3966e2aef9ae00d60923f8f3d57c)
Bug: 60906
Change-Id: I0ee10904caaaadecf43c8c5440f901e6888809bb
---
M includes/Notifications/Controller.php
1 file changed, 10 insertions(+), 10 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Notifications/Controller.php
b/includes/Notifications/Controller.php
index e41c454..3141244 100644
--- a/includes/Notifications/Controller.php
+++ b/includes/Notifications/Controller.php
@@ -90,20 +90,20 @@
$replyToPost = $data['reply-to'];
$extraData += array(
'reply-to' => $replyToPost->getPostId(),
- 'content' => $revision->getContent(),
- 'topic-title' => $data['topic-title'],
+ 'content' => $this->language->truncate(
trim( $revision->getContent() ), 200 ),
+ 'topic-title' =>
$this->language->truncate( trim( $data['topic-title'] ), 200 ),
);
break;
case 'flow-topic-renamed':
$extraData += array(
- 'old-subject' => $data['old-subject'],
- 'new-subject' => $data['new-subject'],
+ 'old-subject' =>
$this->language->truncate( trim( $data['old-subject'] ), 200 ),
+ 'new-subject' =>
$this->language->truncate( trim( $data['new-subject'] ), 200 ),
);
break;
case 'flow-post-edited':
$extraData += array(
- 'content' => $revision->getContent(),
- 'topic-title' => $data['topic-title'],
+ 'content' => $this->language->truncate(
trim( $revision->getContent() ), 200 ),
+ 'topic-title' =>
$this->language->truncate( trim( $data['topic-title'] ), 200 ),
);
break;
}
@@ -164,8 +164,8 @@
'board-workflow' => $boardWorkflow->getId(),
'topic-workflow' => $topicWorkflow->getId(),
'post-id' => $firstPost ?
$firstPost->getRevisionId() : null,
- 'topic-title' => $topicPost->getContent(),
- 'content' => $firstPost ?
$firstPost->getContent() : null,
+ 'topic-title' => $this->language->truncate(
trim( $topicPost->getContent() ), 200 ),
+ 'content' => $firstPost ?
$this->language->truncate( trim( $firstPost->getContent() ), 200 ) : null,
)
) );
@@ -207,8 +207,8 @@
'type' => 'flow-mention',
'title' => $title,
'extra' => array(
- 'content' => $newRevision ?
$newRevision->getContent() : null,
- 'topic-title' => $data['topic-title'],
+ 'content' => $newRevision ?
$this->language->truncate( trim( $newRevision->getContent() ), 200 ) : null,
+ 'topic-title' =>
$this->language->truncate( trim( $data['topic-title'] ), 200 ),
'post-id' => $newRevision ?
$newRevision->getPostId() : null,
'mentioned-users' => $mentionedUsers,
'topic-workflow' =>
$topicWorkflow->getId(),
--
To view, visit https://gerrit.wikimedia.org/r/112730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ee10904caaaadecf43c8c5440f901e6888809bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.23wmf13
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: EBernhardson <[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
