Skip to content
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.

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

Fix Issue https://github.com/piwik/piwik/issues/11410 #11784

Closed
wants to merge 3 commits into from
Closed

Fix Issue https://github.com/piwik/piwik/issues/11410 #11784

wants to merge 3 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Jun 12, 2017

fixes #11410

… indicates if the cookie is secure or not. Issue #11410
Copy link
Member

@sgiehl sgiehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides the small change required to pass JSLint, the minified piwik.js needs to be built. But if you can't to that, we can do it before/after merging.

js/piwik.js Outdated
* Set cookie secure flag
*/
function setSecureCookie(value) {
isSecureCookie = value == 1 ? true : false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JSLint test fails here. Is there any reason for comparing value with 1? If you want to ensure isSecureCookie contains a Boolean afterwards, you could also cast value to Boolean or simply use isSecureCookie = !!value, which should pass JSLint.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sgiehl Hi there! I did the changes you requested, including the minifying. I can see there on my piwik branch but they are not being reflected in the PR. Could you tell me why?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can see them on the PR as well, but could you try to rebase your branch and rebuilt the minified file? It's currently conflicting with 3.x-dev branch.

@mattab mattab added this to the 3.0.5 milestone Jun 21, 2017
@sgiehl
Copy link
Member

sgiehl commented Jun 22, 2017

@dudu84 do you have time to make the mentioned changes?

@ghost
Copy link
Author

ghost commented Jun 22, 2017

@sgiehl Yes, will to until tomorrow. Sorry for the delay.

@ghost
Copy link
Author

ghost commented Jun 28, 2017

@sgiehl Hi Stefan, I did the rebase. But it is conflicting now. Could you shed a light, please?

@sgiehl
Copy link
Member

sgiehl commented Jun 29, 2017

@dudu84 seems your fork is not even with piwik repo. So you need to update your fork before doing the rebase.
Alternatively revert your changes to the minified files and I will update them after merging...

@ghost
Copy link
Author

ghost commented Jun 30, 2017

@sgiehl Thanks for the patience so far. Well I forked it again and applied the changes on a the update repo. Didn't know an easier way to do this, sorry. So I create a new PR: #11834

@sgiehl
Copy link
Member

sgiehl commented Jun 30, 2017

Ok. Thanks. I'll close this one.

@sgiehl sgiehl closed this Jun 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Optional secure tracker cookie
3 participants