diff --git a/VERSIONS_WIP/76258 b/VERSIONS_WIP/76258 new file mode 100644 index 0000000000000000000000000000000000000000..daea402056aa9f8c31391f7420487ed5f29d468b --- /dev/null +++ b/VERSIONS_WIP/76258 @@ -0,0 +1 @@ + - ticket #76258 : Piwik/Matomoto fixe l'extraction du siteId du code javascript \ No newline at end of file diff --git a/library/Class/AdminVar/JsStat.php b/library/Class/AdminVar/JsStat.php index 259fdd7cb1abf779919b9442d7200ec5e50bb4a2..111be79302e59164878282e420b2f61ce8472f30 100644 --- a/library/Class/AdminVar/JsStat.php +++ b/library/Class/AdminVar/JsStat.php @@ -73,6 +73,6 @@ class Class_AdminVar_JsStat { public function getPiwikSiteId() { $script = Class_AdminVar::get('JS_STAT'); preg_match_all("/setSiteId\',([^\]]+)\]\)/i", $script, $matches); - return isset($matches[1][0]) ? trim($matches[1][0]) : ''; + return isset($matches[1][0]) ? trim($matches[1][0], " \t\n\r\0\x0B'\"") : ''; } } \ No newline at end of file diff --git a/tests/scenarios/piwik/PiwikTest.php b/tests/scenarios/piwik/PiwikTest.php index adfe5b54686848391816be27bf92376b83f017bf..358bdbff8c8b9e19b0b3c1840e2a338692a5b97f 100644 --- a/tests/scenarios/piwik/PiwikTest.php +++ b/tests/scenarios/piwik/PiwikTest.php @@ -46,7 +46,7 @@ class PiwikFixtures { (function() { var u=\"//sandbox.pergame.net/piwik/\"; _paq.push(['setTrackerUrl', u+'piwik.php']); - _paq.push(['setSiteId', 8]); + _paq.push(['setSiteId', '8']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })();