Merge pull request #47 from chris1312/master

Invalid source URL for Google Analytics
juriansluiman · Dec 15, 2014 · 26b3477 · 26b3477
2 parents 8afb211 + 4be8b27
commit 26b3477
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php b/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php
@@ -83,14 +83,16 @@ public function getCode()
     protected function getLoadScript()
     {
         $script = 'google-analytics.com/ga.js';
+        $scheme = "'https://ssl.' : 'http://www.'";
         if (true === $this->tracker->getEnableDisplayAdvertising()) {
             $script = 'stats.g.doubleclick.net/dc.js';
+            $scheme = "'https://' : 'http://'";
         }
 
         return <<<SCRIPT
 (function() {
   var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-  ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + '$script';
+  ga.src = ('https:' == document.location.protocol ? $scheme) + '$script';
   var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 })();\n
 SCRIPT;

diff --git a/tests/SlmGoogleAnalyticsTest/View/Helper/Script/GajsTest.php b/tests/SlmGoogleAnalyticsTest/View/Helper/Script/GajsTest.php
@@ -113,7 +113,7 @@ public function testHelperLoadsFileFromGoogle()
         $expected = <<<SCRIPT
 (function() {
   var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-  ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'google-analytics.com/ga.js';
+  ga.src = ('https:' == document.location.protocol ? 'https://ssl.' : 'http://www.') + 'google-analytics.com/ga.js';
   var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 })();\n
 SCRIPT;