From 9d08020a8de83250a20caaa7cb292c91539d4f12 Mon Sep 17 00:00:00 2001
From: Sven Slootweg <jamsoftgamedev@gmail.com>
Date: Wed, 19 Sep 2012 20:11:27 +0200
Subject: [PATCH] Use the new template parser for the errorhandler component

---
 components/component.errorhandler.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/components/component.errorhandler.php b/components/component.errorhandler.php
index caa91ab..642ca85 100644
--- a/components/component.errorhandler.php
+++ b/components/component.errorhandler.php
@@ -42,30 +42,27 @@ class CPHPErrorHandler
 	{
 		global $locale;
 		
-		$template['error'] = new Templater();
-		
 		switch($this->sErrorType)
 		{
 			case CPHP_ERRORHANDLER_TYPE_ERROR:
-				$template['error']->Load("errorhandler.error");
+				$template = "errorhandler.error";
 				break;
 			case CPHP_ERRORHANDLER_TYPE_INFO:
-				$template['error']->Load("errorhandler.info");
+				$template = "errorhandler.info";
 				break;
 			case CPHP_ERRORHANDLER_TYPE_WARNING:
-				$template['error']->Load("errorhandler.warning");
+				$template = "errorhandler.warning";
 				break;
 			case CPHP_ERRORHANDLER_TYPE_SUCCESS:
-				$template['error']->Load("errorhandler.success");
+				$template = "errorhandler.success";
 				break;
+			default:
+				return false;
 		}
 		
-		$template['error']->Localize($locale->strings);
-		$template['error']->Compile(array(
+		return Templater::AdvancedParse($template, $locale->strings, array(
 			'title'		=> $this->sTitle,
 			'message'	=> $this->sMessage
 		));
-		
-		return $template['error']->Render();
 	}
 }