Merge remote-tracking branch 'origin/2.0' into 2.1

This commit is contained in:
Jose Lorenzo Rodriguez 2012-02-12 21:04:35 -04:30
commit 4f176d4284

View file

@ -484,7 +484,7 @@ class CookieComponent extends Component {
*/ */
protected function _explode($string) { protected function _explode($string) {
$first = substr($string, 0, 1); $first = substr($string, 0, 1);
if ($first !== false && $first === '{' || $first === '[') { if ($first === '{' || $first === '[') {
$ret = json_decode($string, true); $ret = json_decode($string, true);
return ($ret != null) ? $ret : $string; return ($ret != null) ? $ret : $string;
} }