X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ftemplate%2Fclass_BaseTemplateEngine.php;h=8a58b46d1d6d4d2c4f1950861087b4a9d19a24fe;hp=79981fb6d5bcbf5b6366f5a0744f60f25a25357a;hb=56764dad28dafd1292c9ed125135a3a8115b2147;hpb=d73abafb0f0126fa95ca6cb76cbf6c519bc99f43

diff --git a/inc/classes/main/template/class_BaseTemplateEngine.php b/inc/classes/main/template/class_BaseTemplateEngine.php
index 79981fb6..8a58b46d 100644
--- a/inc/classes/main/template/class_BaseTemplateEngine.php
+++ b/inc/classes/main/template/class_BaseTemplateEngine.php
@@ -950,6 +950,8 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 	 * @param	$template	The email template we shall load which is located in
 	 *						'emails' by default
 	 * @return	void
+	 * @deprecated
+	 * @see		See loadCodeTemplate()
 	 */
 	public function loadEmailTemplate ($template) {
 		// Set template type
@@ -1289,43 +1291,18 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 	 * @return	void
 	 * @throws	XmlParserException	If an XML error was found
 	 */
-	public final function renderXmlContent ($content = null) {
+	public function renderXmlContent ($content = null) {
 		// Is the content set?
 		if (is_null($content)) {
 			// Get current content
 			$content = $this->getRawTemplateData();
 		} // END - if
 
-		// Convert all to UTF8
-		if (function_exists('recode')) {
-			$content = recode("html..utf8", $content);
-		} else {
-			// @TODO We need to find a fallback solution here
-			$this->partialStub('Cannot find recode extension!');
-		} // END - if
-
-		// Get an XML parser
-		$xmlParser = xml_parser_create();
-
-		// Force case-folding to on
-		xml_parser_set_option($xmlParser, XML_OPTION_CASE_FOLDING, true);
-
-		// Set object
-		xml_set_object($xmlParser, $this);
-
-		// Set handler call-backs
-		xml_set_element_handler($xmlParser, 'startElement', 'endElement');
-		xml_set_character_data_handler($xmlParser, 'characterHandler');
-
-		// Now parse the XML tree
-		if (!xml_parse($xmlParser, $content)) {
-			// Error found in XML!
-			//die('<pre>'.htmlentities($content).'</pre>');
-			throw new XmlParserException(array($this, $xmlParser), BaseHelper::EXCEPTION_XML_PARSER_ERROR);
-		} // END - if
+		// Get a XmlParser instance
+		$parserInstance = ObjectFactory::createObjectByConfiguredName('xml_parser_class', array($this));
 
-		// Free the parser
-		xml_parser_free($xmlParser);
+		// Parse the XML document
+		$parserInstance->parseXmlContent($content);
 	}
 }