Merge branch 'ticket/15014-invite_credits' into develop

modules/ant_canonical/ant_canonical.php

@@ -48,7 +48,8 @@ class Ant_Canonical extends Module
         $domain = Configuration::get('PS_SSL_ENABLED') ?
             Configuration::get('PS_SHOP_DOMAIN_SSL') : Configuration::get('PS_SHOP_DOMAIN');
         $host = str_replace('bebeboutik.com', 'bebeboutik.'.$tld, $domain);
-        $host = (Configuration::get('PS_SSL_ENABLED') ? 'https://' : 'http://').$host;
+        //$host = (Configuration::get('PS_SSL_ENABLED') ? 'https://' : 'http://').$host;
+        $host = 'https://'.$host;
                 
         // Page category
         if ($page_name == 'category') {

modules/blockuserinfo/blockuserinfo.php

@@ -74,6 +74,7 @@ class BlockUserInfo extends Module
     	}
     	
     	$display_credits = false;
+    	$loyalties = null;
     	if ($this->disableCredits === false) {
             $display_credits = true;
     	    $sql = 'SELECT id_customer FROM `'._DB_PREFIX_.'customer_credits` WHERE id_customer  = ' .(int) $cookie->id_customer;
@@ -115,6 +116,7 @@ class BlockUserInfo extends Module
 		global $smarty, $cookie, $cart;
 
 		$display_credits = false;
+		$loyalties = null;
 		if ($this->disableCredits === false) {
     		$display_credits = true;
     		if ($cookie->logged) {

modules/invite/.hg/branch

@@ -1 +0,0 @@
-default

modules/invite/.hg/cache/branchheads

@@ -1,2 +0,0 @@
-0cc9f45d26c01e5acf699ed63cfa4bea75a652c4 14
-0cc9f45d26c01e5acf699ed63cfa4bea75a652c4 default

modules/invite/.hg/cache/tags

@@ -1,2 +0,0 @@
-14 0cc9f45d26c01e5acf699ed63cfa4bea75a652c4
-

modules/invite/.hg/hgrc

@@ -1,2 +0,0 @@
-[paths]
-default = ssh://ewen@localhost//hg/invite

modules/invite/.hg/requires

@@ -1,4 +0,0 @@
-revlogv1
-fncache
-store
-dotencode