diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2014-09-10 18:42:08 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2014-09-10 18:42:08 +0400 |
| commit | 77abe4062a9fc71524a3a79c92c77f1cfced5eba (patch) | |
| tree | b960a6c19074cf2fa54956420dba5a6a17f9b124 /plugins/Morpheus/templates/javascriptCode.tpl | |
| parent | df65e0dd10f12e11990665971e5f7e019168fd39 (diff) | |
| parent | 25545fdc55a1decd13548c1f3f6479789956e56c (diff) | |
Merge remote-tracking branch 'origin/master' into 4996_content_tracking
Conflicts:
core/Metrics.php
js/piwik.js
piwik.js
tests/javascript/index.php
Diffstat (limited to 'plugins/Morpheus/templates/javascriptCode.tpl')
| -rw-r--r-- | plugins/Morpheus/templates/javascriptCode.tpl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/Morpheus/templates/javascriptCode.tpl b/plugins/Morpheus/templates/javascriptCode.tpl index 488f39d00c..344e6d0311 100644 --- a/plugins/Morpheus/templates/javascriptCode.tpl +++ b/plugins/Morpheus/templates/javascriptCode.tpl @@ -7,9 +7,9 @@ {$setTrackerUrl} _paq.push(['setTrackerUrl', u+'piwik.php']); _paq.push(['setSiteId', {$idSite}]); - var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; - g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); + 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="http://{$piwikUrl}/piwik.php?idsite={$idSite}" style="border:0;" alt="" /></p></noscript> +<noscript><p><img src="//{$piwikUrl}/piwik.php?idsite={$idSite}" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> |