Fixes empty favorite names for trailing slashes #11228
Merged
Conversation
This file contains 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
weeman1337
added
3. to review
skjnldsv
approved these changes
Sep 16, 2018
| */ | ||
| private function getDirDisplayName(string $dir): string { | ||
| if (substr($dir, -1) === '/') { | ||
| $dir = substr($dir, 0, -1); |
There was a problem hiding this comment.
rtrim($dir, '/') does all this in one nice method ;)
There was a problem hiding this comment.
cool - I will update it!
weeman1337
force-pushed
the
fix/11144/empty-favorite-names
branch
from
2a8e7df
to
7f53b9c
Compare
nickvergessen
approved these changes
Sep 19, 2018
kesselb
reviewed
Sep 19, 2018
| */ | ||
| private function getDirDisplayName(string $dir): string { | ||
| $dir = rtrim($dir, '/'); | ||
| return substr($dir, strrpos($dir, '/') + 1, strlen($dir)); |
There was a problem hiding this comment.
Does your tests pass when you replace substr with http://php.net/manual/en/function.basename.php?
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
weeman1337
force-pushed
the
fix/11144/empty-favorite-names
branch
from
7f53b9c
to
7e92b52
Compare
kesselb
approved these changes
Sep 19, 2018
nickvergessen
approved these changes
Sep 19, 2018
nickvergessen
added
4. to release
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.
The "function" for getting a readable directory name didn't work for trailing directory separators.
Relates to #11144