// Merge -> revision 7979

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7981 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-10 08:36:17 +00:00
parent f4a3e88283
commit 7411db9a69
26 changed files with 262 additions and 55 deletions
@@ -70,7 +70,10 @@ class ToolsCore
 			}

 			$explode = explode('?', $url);
-			$url = $link->getPageLink($explode[0], true);
+			// don't use ssl if url is home page 
+			// used when logout for example
+			$useSSL = !empty($url);
+			$url = $link->getPageLink($explode[0], $useSSL);
 			if (isset($explode[1]))
 				$url .= '?'.$explode[1];
 			$baseUri = '';