Index: branches/5.2.x/core/units/helpers/xml_helper.php =================================================================== diff -u -N -r14092 -r14095 --- branches/5.2.x/core/units/helpers/xml_helper.php (.../xml_helper.php) (revision 14092) +++ branches/5.2.x/core/units/helpers/xml_helper.php (.../xml_helper.php) (revision 14095) @@ -1,6 +1,6 @@ XMLNodeClassName = 'kXMLNode5'; - k4_include_once( dirname(__FILE__) . DIRECTORY_SEPARATOR . 'xml_helper5.php' ); + kUtil::includeOnce( dirname(__FILE__) . DIRECTORY_SEPARATOR . 'xml_helper5.php' ); } } @@ -47,7 +59,7 @@ * @param bool $no_case_folding * @return kXMLNode */ - function &Parse($xml = null, $mode = null, $no_case_folding = false) + function &Parse($xml = null, $mode = self::XML_NO_TEXT_NODES, $no_case_folding = false) { $xml = trim($xml); $this->Mode = !isset($mode) ? XML_NO_TEXT_NODES : $mode; @@ -134,7 +146,7 @@ function characterData($Parser, $Line) { - if ($this->Mode == XML_WITH_TEXT_NODES) { + if ($this->Mode == self::XML_WITH_TEXT_NODES) { $class_name = $this->XMLNodeClassName; $text_node = new $class_name('_TEXT_'); $text_node->AppendData($Line); @@ -147,7 +159,7 @@ function endElement($Parser, $Elem) { - if ($this->Mode == XML_WITH_TEXT_NODES) { + if ($this->Mode == self::XML_WITH_TEXT_NODES) { /*if (count($this->CurrentElement->Children) == 1 && $this->CurrentElement->firstChild->Name == '_TEXT_') { $this->CurrentElement->Children = array(); }*/