fix display of remote users in incoming share notifications #22062
Conversation
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
Signed-off-by: Arthur Schiwon <[email protected]>
Signed-off-by: Arthur Schiwon <[email protected]>
blizzz
requested review from
MorrisJobke,
gbiggs,
georgehrke,
juliusknorr,
nickvergessen,
rullzer and
skjnldsv
Member
Author
|
/backport to stable19 |
| } | ||
|
|
||
| try { | ||
| return $this->getDisplayNameFromContact($user . '@https://' . $server); |
Member
Author
There was a problem hiding this comment.
didn't touch the order. can switch. actually i do wonder whether there is a valid use case for those two fall backs?
|
|
||
| if ($property === 'CLOUD' && preg_match('/[^a-zA-Z0-9 _.@\-\']/', $pattern) === 1) { | ||
| // There can be no chars in cloud ids which are not valid for user ids | ||
| if ($property === 'CLOUD' && preg_match('/[^a-zA-Z0-9 :_.@\/\-\']/', $pattern) === 1) { |
| ); | ||
|
|
||
| $initiator = $params[0]; | ||
| $initiatorDisplay = isset($params[3]) ? $params[3] : null; |
Member
There was a problem hiding this comment.
then we can revert the change where this was added?
Member
Author
There was a problem hiding this comment.
some details (formating, error information) are still in place.
nickvergessen
approved these changes
Jul 30, 2020
skjnldsv
approved these changes
Jul 31, 2020
Signed-off-by: Arthur Schiwon <[email protected]>
Signed-off-by: Joas Schilling <[email protected]>
Signed-off-by: Joas Schilling <[email protected]>
This comment has been minimized.
This comment has been minimized.
blizzz
deleted the
fix/noid/displayname-in-incoming-remote-share-notification
branch
Member
|
Any reason not to backport this to stable18 ? |
Member
Author
I don't remember if it was affected or not. If it is, and the fix applies, then nothing speaks against a backport. |
Member
|
/backport to stable18 |
Member
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Before
After:
Hint for reviewers: have a look at the first commit, the second contains code style changes only.