Skip to content
Extraits de code Groupes Projets
Valider 2bd01549 rédigé par Joubert RedRat's avatar Joubert RedRat Validation de Thomas Steur
Parcourir les fichiers

Put idSite into single quote for support custom string id (#10247)

* Put idSite into single quote for support custom id

This is small change, but is necessary for https://github.com/piwik/piwik/issues/9975 and https://github.com/piwik/piwik/issues/4920. On my tests, even with single quote, numeric idSite works fine.

* Change unit test expected to support test with strings

* Change expected data to support test with strings
parent 581ea159
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -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);
})();
......
......@@ -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);
})();
......
......@@ -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>
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter