Renamed endElement() to finishElement(), see the final implementation in BaseXmlTempl...

[core.git] / inc / classes / main / parser / xml / class_XmlParser.php

diff --git a/inc/classes/main/parser/xml/class_XmlParser.php b/inc/classes/main/parser/xml/class_XmlParser.php
index 6fb429ab99ddf755a9ea88bc6b01e220b6baface..85b6ab7304c097c1da84f73fc0ca6503180959fe 100644 (file)
--- a/inc/classes/main/parser/xml/class_XmlParser.php
+++ b/inc/classes/main/parser/xml/class_XmlParser.php
@@ -65,10 +65,10 @@ class XmlParser extends BaseParser implements Parseable {
                // Convert all to UTF8
                if (empty($content)) {
                        // No empty content!
-                       $this->debugOuput('Empty content! Backtrace: <pre>');
+                       self::createDebugInstance(__CLASS__)->debugOutput('Empty content! Backtrace: <pre>');
                        debug_print_backtrace();
-                       $this->debugOuput('</pre>');
-                       die();
+                       self::createDebugInstance(__CLASS__)->debugOutput('</pre>');
+                       exit();
                } elseif (function_exists('recode')) {
                        // Recode found, so use it
                        $content = recode('html..utf8', $content);
@@ -96,13 +96,13 @@ class XmlParser extends BaseParser implements Parseable {
                xml_set_object($xmlParser, $templateInstance);
 
                // Set handler call-backs
-               xml_set_element_handler($xmlParser, 'startElement', 'endElement');
+               xml_set_element_handler($xmlParser, 'startElement', 'finishElement');
                xml_set_character_data_handler($xmlParser, 'characterHandler');
 
                // Now parse the XML tree
                if (!xml_parse($xmlParser, $content)) {
                        // Error found in XML!
-                       //* DEBUG: */ die('<pre>'.htmlentities($content).'</pre>');
+                       //* DEBUG: */ exit(__METHOD__ . ':<pre>'.htmlentities($content).'</pre>');
                        throw new XmlParserException(array($this, $xmlParser), self::EXCEPTION_XML_PARSER_ERROR);
                } // END - if