diff --git a/plugins/Morpheus/templates/javascriptCode.tpl b/plugins/Morpheus/templates/javascriptCode.tpl index 125259b8072e72c7a0f09ce833d86f1abacd06d6..18483dd09d54dd002f746dcd5283c13abb2b31aa 100644 --- a/plugins/Morpheus/templates/javascriptCode.tpl +++ b/plugins/Morpheus/templates/javascriptCode.tpl @@ -6,7 +6,7 @@ (function() { {$setTrackerUrl} {$optionsBeforeTrackerUrl}_paq.push(['setTrackerUrl', u+'piwik.php']); - _paq.push(['setSiteId', {$idSite}]); + _paq.push(['setSiteId', '{$idSite}']); 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); })(); diff --git a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php index 5e932a42e1890e7f8ad0a0d3c44faf55187335d7..06f4bb5916b2e92458113c5e85536608487917be 100644 --- a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php +++ b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php @@ -45,7 +45,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase (function() { var u="//localhost/piwik/"; _paq.push(['setTrackerUrl', u+'piwik.php']); - _paq.push(['setSiteId', 1]); + _paq.push(['setSiteId', '1']); 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); })(); @@ -92,7 +92,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase (function() { var u="https://localhost/piwik/"; _paq.push(['setTrackerUrl', u+'piwik.php']); - _paq.push(['setSiteId', 1]); + _paq.push(['setSiteId', '1']); 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); })(); @@ -140,7 +140,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase var u="//localhost/piwik/"; _paq.push(['setAPIUrl', 'http://localhost/statistics']); _paq.push(['setTrackerUrl', u+'piwik.php']); - _paq.push(['setSiteId', 1]); + _paq.push(['setSiteId', '1']); 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); })(); @@ -183,7 +183,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase (function() { var u="//abc"def/"; _paq.push([\'setTrackerUrl\', u+\'piwik.php\']); - _paq.push([\'setSiteId\', 1]); + _paq.push([\'setSiteId\', \'1\']); 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); })(); diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml index d4c25ca5220778469796c1cd37d47559a2b0a966..c8c4cc202217e9357aad0ecdc9c51d46163bd267 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml @@ -7,11 +7,11 @@ (function() { var u="//example.org/piwik/"; _paq.push(['setTrackerUrl', u+'piwik.php']); - _paq.push(['setSiteId', 1]); + _paq.push(['setSiteId', '1']); 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); })(); </script> <noscript><p><img src="//example.org/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> -</result> \ No newline at end of file +</result>