Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5

Dolibarr · Jul 14, 2014 · 25f1259 · 25f1259
2 parents 2cf9a75 + 32a6d59
commit 25f1259
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php
@@ -91,7 +91,9 @@ function decryptCookie()
 			$num = (count($this->cookiearray) - 2);
 			for ($f = 0; $f <= $num; $f++)
 			{
-				$this->myValue .= strval(chr($this->cookiearray[$f]/$this->myKey));
+				if (!empty($this->myKey)) {
+					$this->myValue .= strval(chr($this->cookiearray[$f]/$this->myKey));
+				}
 			}
 
 			return(base64_decode($this->myValue));