Do not use eval in minified piwik.js, replace JSON2 with JSON3 #8896
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
| @@ -5624,7 +6188,9 @@ if (typeof piwik_log !== 'function') { | |||
|
|
|||
| function getOption(optionName) { | |||
| try { | |||
| return eval('piwik_' + optionName); | |||
| if (window['piwik_' + optionName]) { | |||
There was a problem hiding this comment.
I'm not sure how the old tracker used to work but this should be the same
|
After merging it, I'd run the tests on some older browsers via saucelabs on top to make sure it works with IE6 etc |
| @@ -439,10 +439,14 @@ function PiwikTest() { | |||
| var src = '<?php | |||
| $src = file_get_contents('../../js/piwik.js'); | |||
| $src = strtr($src, array('\\'=>'\\\\',"'"=>"\\'",'"'=>'\\"',"\r"=>'\\r',"\n"=>'\\n','</'=>'<\/')); | |||
| $src = substr($src, strpos($src, '/* startjslint */')); | |||
There was a problem hiding this comment.
This is a workaround to not run JSON3 through JSLINT as we cannot make it JSLINT compatible
mattab
pushed a commit
that referenced
this pull request
Oct 4, 2015
Do not use eval in minified piwik.js, replace JSON2 with JSON3
|
Nice. Next step: #1542 |
|
FYI: Ran JSON tests on IE6 and IE7 and worked. Not all other tests don't work because they are not compatible with older browsers |
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 #5960 refs #1542