Fixes for a regression introduced by #4221 #4502
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
#4221 was incorrectly using str_replace() to remove the default language code when needed. As str_replace acts globally on the subject, the language code was removed also out of context (e.g. when part of an alias). With this PR I use instead preg_replace with the limit of one substitution. due to the fact that the /language-code string to be replaced appears just after the host name and cannot be part of it (due to the/), this should guarantee the correct replacements of the language code only. I took the occasion to make a bit of clean-up by aggregating some redundantly duplicated code
|
@test |
|
@test |
|
I just noticed my local copy of languagefilter.php is CR-LF terminated (à-la-windows...) Is this a problem? Can be fixed? |
|
It is Unix in core |
infograf768
added a commit
that referenced
this pull request
Oct 10, 2014
Fixes for a regression introduced by #4221
|
Thanks for the fix. Merged. |
|
You're welcome! |
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.
#4221 was incorrectly using str_replace() to remove the default language code when required. As str_replace() acts globally on the subject, the language code was removed also out of context (e.g. when part of an alias).
With this PR I use instead preg_replace() with the limit of one substitution. As the /language-code/ string to be replaced appears between two slashes and just after the host name (eg. http://example.com/en/) this should guarantee the correct replacements of the language code only.
I took the occasion to make a bit of clean-up by aggregating some redundantly duplicated code