mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-02-07 12:36:25 +00:00
Updating XML class to use _name_ in place of __identity__ for Set object conversions (Ticket #3696)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6192 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
10a2a446d3
commit
c128439fef
1 changed files with 3 additions and 3 deletions
|
@ -122,8 +122,8 @@ class XMLNode extends Object {
|
||||||
return $objects;
|
return $objects;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($object->__identity__) && !empty($object->__identity__)) {
|
if (isset($object->_name_) && !empty($object->_name_)) {
|
||||||
$name = $object->__identity__;
|
$name = $object->_name_;
|
||||||
} elseif (isset($object->name) && $object->name != null) {
|
} elseif (isset($object->name) && $object->name != null) {
|
||||||
$name = $object->name;
|
$name = $object->name;
|
||||||
} else {
|
} else {
|
||||||
|
@ -156,7 +156,7 @@ class XMLNode extends Object {
|
||||||
unset($attributes[$key]);
|
unset($attributes[$key]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
unset($attributes['__identity__']);
|
unset($attributes['_name_']);
|
||||||
|
|
||||||
$node = new XMLNode($name, $attributes, null, $children);
|
$node = new XMLNode($name, $attributes, null, $children);
|
||||||
return $node;
|
return $node;
|
||||||
|
|
Loading…
Add table
Reference in a new issue