Fix detection of Piwik URL for overlay when using a custom piwik.php path for tracking #9775
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
tsteur
added
not-in-changelog
|
|
||
| if (stringEndsWith(trackerUrl, 'piwik.php')) { | ||
| // if eg without domain or path "piwik.php" => '' | ||
| trackerUrl = removeCharactersFromEndOfString(trackerUrl, 'piwik.php'.length); |
There was a problem hiding this comment.
It's the same case like below (see else if section), so looks like it's unnecessary.
There was a problem hiding this comment.
I want to have this case there explicitly for a bit better readability and to make sure not to break anything compared to before as piwik.php is removed slightly differently below which should end in the same result but wasn't sure re side effects. I will remove it.
|
Besides the note from @kaz231 LGTM |
|
@sgiehl I removed it |
|
@tsteur Looks good to merge. would you resolve the conflicts and merge afterwards? |
|
I'll fix merge conflict and will merge afterwards |
tsteur
added a commit
that referenced
this pull request
Mar 7, 2016
Fix detection of Piwik URL for overlay when using a custom piwik.php path for tracking
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.
fixes #9467