adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moving XmlNode::__killParent() to a protected method so Xml can access it. Adding _killParent(true) call to Xml::__destruct. Forces destruction of circular references held in child objects when an xml object is garbage collected. Fixes #369

Browse source
This commit is contained in:
mark_story 2009-12-01 10:01:36 -05:00
parent cd46f4db2e
commit 6046528744
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cake/libs/xml.php
View file

@ -110,7 +110,6 @@ class XmlNode extends Object {
$this->createTextNode($value); $this->createTextNode($value);
} }
} }
/** /**
* Adds a namespace to the current node * Adds a namespace to the current node
* *
@ -732,13 +731,13 @@ class XmlNode extends Object {
* if given the $recursive parameter. * if given the $recursive parameter.
* *
* @param boolean $recursive Recursively delete elements. * @param boolean $recursive Recursively delete elements.
* @access private * @access protected
*/ */
function __killParent($recursive = true) { function _killParent($recursive = true) {
unset($this->__parent, $this->_log); unset($this->__parent, $this->_log);
if ($recursive && $this->hasChildren()) { if ($recursive && $this->hasChildren()) {
for ($i = 0; $i < count($this->children); $i++) { for ($i = 0; $i < count($this->children); $i++) {
$this->children[$i]->__killParent(true); $this->children[$i]->_killParent(true);
} }
} }
} }
@ -1093,6 +1092,7 @@ class Xml extends XmlNode {
if (is_resource($this->__parser)) { if (is_resource($this->__parser)) {
xml_parser_free($this->__parser); xml_parser_free($this->__parser);
} }
$this->_killParent(true);
} }
/** /**
* Adds a namespace to any XML documents generated or parsed * Adds a namespace to any XML documents generated or parsed