adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-18 23:49:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing real issue for Ticket #137

Browse source 
Reverted changes replacing [ and ] with .
This commit is contained in:
phpnut 2009-11-03 22:02:26 -06:00
parent 7bead5df30
commit a1ce9e662c
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cake/libs/controller/components/cookie.php
View file

@ -215,7 +215,7 @@ class CookieComponent extends Object {
foreach ($key as $name => $value) { foreach ($key as $name => $value) {
if (strpos($name, '.') === false) { if (strpos($name, '.') === false) {
$this->__values[$name] = $value; $this->__values[$name] = $value;
$this->__write(".$name", $value); $this->__write("[$name]", $value);
} else { } else {
$names = explode('.', $name, 2); $names = explode('.', $name, 2);
@ -223,7 +223,7 @@ class CookieComponent extends Object {
$this->__values[$names[0]] = array(); $this->__values[$names[0]] = array();
} }
$this->__values[$names[0]] = Set::insert($this->__values[$names[0]], $names[1], $value); $this->__values[$names[0]] = Set::insert($this->__values[$names[0]], $names[1], $value);
$this->__write("." . implode('.', $names), $value); $this->__write('[' . implode('][', $names) . ']', $value);
} }
} }
$this->__encrypted = true; $this->__encrypted = true;
@ -289,12 +289,12 @@ class CookieComponent extends Object {
} }
if (strpos($key, '.') === false) { if (strpos($key, '.') === false) {
unset($this->__values[$key]); unset($this->__values[$key]);
$this->__delete(".$key"); $this->__delete("[$key]");
return; return;
} }
$names = explode('.', $key, 2); $names = explode('.', $key, 2);
$this->__values[$names[0]] = Set::remove($this->__values[$names[0]], $names[1]); $this->__values[$names[0]] = Set::remove($this->__values[$names[0]], $names[1]);
$this->__delete("." . implode('.', $names)); $this->__delete('[' . implode('][', $names) . ']');
} }
/** /**
@ -315,11 +315,11 @@ class CookieComponent extends Object {
if (is_array($value)) { if (is_array($value)) {
foreach ($value as $key => $val) { foreach ($value as $key => $val) {
unset($this->__values[$name][$key]); unset($this->__values[$name][$key]);
$this->__delete(".$name.$key"); $this->__delete("[$name][$key]");
} }
} }
unset($this->__values[$name]); unset($this->__values[$name]);
$this->__delete(".$name"); $this->__delete("[$name]");
} }
} }
@ -354,6 +354,11 @@ class CookieComponent extends Object {
return $this->__expires; return $this->__expires;
} }
$this->__reset = $this->__expires; $this->__reset = $this->__expires;
if ($expires == 0) {
return $this->__expires = 0;
}
if (is_integer($expires) || is_numeric($expires)) { if (is_integer($expires) || is_numeric($expires)) {
return $this->__expires = $now + intval($expires); return $this->__expires = $now + intval($expires);
} }