Trim the subject before encrypting the subject#383
Merged
nickvergessen merged 1 commit intomasterfrom Jul 16, 2019
Merged
Conversation
Signed-off-by: Joas Schilling <coding@schilljs.com>
Member
Author
|
/backport to stable16 |
Member
Author
|
/backport to stable15 |
Member
Author
|
/backport to stable14 |
rullzer
reviewed
Jul 16, 2019
| $subject = $notification->getParsedSubject(); | ||
| $dataLength = 245 - strlen(json_encode($data)); | ||
| if (strlen($subject) > $dataLength) { | ||
| $data['subject'] = substr($subject, 0, $dataLength) . '…'; |
Member
There was a problem hiding this comment.
Should the substr not be 1 shorter than the dataLength?
Member
Author
There was a problem hiding this comment.
I started with 245, instead of 255 so we have a little buffer there
Member
There was a problem hiding this comment.
Ah ok perfect. I wasn't sure if that was maybe for other metadata somewhere.
rullzer
approved these changes
Jul 16, 2019
delete-merged-branch
bot
deleted the
bugfix/346/trim-subject-before-encrypting
branch
|
backport to stable16 in #384 |
|
backport to stable15 in #385 |
|
backport to stable14 in #386 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix #346