Merge remote-tracking branch 'origin/master'

Conflicts:
	app/design/frontend/base/default/template/piwikanalytics/piwik.phtml
	package.xml

Author: adrianspeyer

app/design/frontend/base/default/template/piwikanalytics/piwik.phtml

@@ -19,9 +19,30 @@
 
     if ($siteId) {
 
+<<<<<<< HEAD
         /*remove https or https*/
 	   $installPath = preg_replace('#^https?:#', '', $installPath);
 
+=======
+        /*path for noscript should take unaltered path*/
+        $bugPath = $installPath;
+        	
+        if (strpos($installPath, 'https://') !== false) {
+            $secureInstallPath = $installPath;
+            $installPath = str_replace('https://', 'http://', $installPath);
+        }
+        if (strpos($installPath, 'http://') === false) {
+            $installPath = 'http://' . $installPath;
+            $secureInstallPath = str_replace('http://', 'https://', $installPath);
+        }
+
+        $last = $installPath[strlen($installPath) - 1];
+
+        if ($last != '/') {
+            $installPath .= '/';
+            $secureInstallPath .= '/';
+        }
+>>>>>>> origin/master
 
         // 0 Search Results
         if($this->getRequest()->getControllerName()=='result') {
@@ -38,9 +59,14 @@
         <script type="text/javascript">
             //<![CDATA[
             var _paq = _paq || [];
+<<<<<<< HEAD
             (function(){ 
 				var u="<?php echo $installPath ?>";
 			    _paq.push(['setSiteId', <?php echo $siteId ?>]);
+=======
+            (function(){ var u=(("https:" == document.location.protocol) ? "<?php echo $secureInstallPath ?>" : "<?php echo $installPath ?>");
+                _paq.push(['setSiteId', <?php echo $siteId ?>]);
+>>>>>>> origin/master
                 _paq.push(['setTrackerUrl', u+'piwik.php']);
                 <?php echo $this->_getEcommerceCartUpdate()?>
                 <?php echo $this->_getOrdersTrackingCode()?>

package.xml

@@ -40,7 +40,13 @@ Version 1.1.6 Refactor tracker
 access to the Piwik iframe***
 
 &lt;p&gt;After install, make sure you clear your cache. Click &lt;strong&gt;&lt;a href="http://www.statstory.com/piwik-ecommerce-extension-for-magento/"&gt;here&lt;/a&gt;&lt;/strong&gt; for more details on how it works and how to install.&lt;/p&gt;</description>
+<<<<<<< HEAD
     <notes>Source code Available at:  https://github.com/adriansonline/Piwik-for-Magento&#xD;
+=======
+    <notes>Piwik Search "No Search" results data in Piwik via noroute&#xD;
+&#xD;
+Source code Available at:  https://github.com/adrianspeyer/Piwik-for-Magento&#xD;
+>>>>>>> origin/master
 &#xD;
 </notes>
     <authors><author><name>Adrian Speyer</name><user>AdrianSpeyer</user><email>[email protected]</email></author></authors>