Skip to content

piwikUrl.getSearchParam() should not set an empty URL value #12728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Urgent update to Danish translation
merged 1 commit into from
Apr 23, 2018
Merged

piwikUrl.getSearchParam() should not set an empty URL value #12728

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions plugins/CoreHome/angularjs/common/services/piwik-url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,20 @@

if (!search[paramName]) {
// see https://github.com/angular/angular.js/issues/7239 (issue is resolved but problem still exists)
search[paramName] = piwik.broadcast.getValueFromUrl(paramName);
var paramUrlValue = piwik.broadcast.getValueFromUrl(paramName);
if (paramUrlValue !== false
&& paramUrlValue !== ''
&& paramUrlValue !== null
&& paramUrlValue !== undefined
&& paramName !== 'token_auth') {
search[paramName] = paramUrlValue;
} else {
return paramUrlValue;
}
}

if (search[paramName]) {
var value = search[paramName];
var value = search[paramName];

if (angular.isArray(search[paramName])) {
// use last one. Eg when having period=day&period=year angular would otherwise return ['day', 'year']
Expand All @@ -51,4 +60,4 @@
}
}
}
})();
})();