mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-31 09:06:17 +00:00
Adding fix for Ticket #2285
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4671 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
12f99cd1e9
commit
8fa50d9100
1 changed files with 2 additions and 2 deletions
|
@ -283,7 +283,7 @@ class Helper extends Overloadable {
|
||||||
$attribute = sprintf($attributeFormat, $key, $key);
|
$attribute = sprintf($attributeFormat, $key, $key);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$attribute = sprintf($attributeFormat, $key, htmlspecialchars($value));
|
$attribute = sprintf($attributeFormat, $key, h($value));
|
||||||
}
|
}
|
||||||
return $attribute;
|
return $attribute;
|
||||||
}
|
}
|
||||||
|
@ -457,7 +457,7 @@ class Helper extends Overloadable {
|
||||||
|
|
||||||
$result = null;
|
$result = null;
|
||||||
if (isset($this->data[$this->model()][$this->field()])) {
|
if (isset($this->data[$this->model()][$this->field()])) {
|
||||||
$result = h($this->data[$this->model()][$this->field()]);
|
$result = $this->data[$this->model()][$this->field()];
|
||||||
} elseif (isset($this->data[$this->field()]) && is_array($this->data[$this->field()])) {
|
} elseif (isset($this->data[$this->field()]) && is_array($this->data[$this->field()])) {
|
||||||
if (ClassRegistry::isKeySet($this->field())) {
|
if (ClassRegistry::isKeySet($this->field())) {
|
||||||
$key =& ClassRegistry::getObject($this->field());
|
$key =& ClassRegistry::getObject($this->field());
|
||||||
|
|
Loading…
Add table
Reference in a new issue