From 146d2e01f0ac11489e40a398dd79d5e3946f42ac Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 6 Jun 2010 17:42:26 +0000
Subject: [PATCH] Rewrite for eval() command

---
 inc/functions.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 305ee3f8aa..254a29a17e 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -324,9 +324,6 @@ function loadTemplate ($template, $return = false, $content = array()) {
 
 			// Cache the eval() command here
 			$GLOBALS['template_eval'][$template] = $eval;
-
-			// Eval the code
-			eval($GLOBALS['template_eval'][$template]);
 		} elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) {
 			// Only admins shall see this warning or when installation mode is active
 			$ret = '<br /><span class="guest_failed">{--TEMPLATE_404--}</span><br />
@@ -341,10 +338,13 @@ function loadTemplate ($template, $return = false, $content = array()) {
 			// No file!
 			$GLOBALS['template_eval'][$template] = '404';
 		}
-	} else {
+	}
+
+	// Code set?
+	if ((isset($GLOBALS['template_eval'][$template])) && ($GLOBALS['template_eval'][$template] != '404')) {
 		// Eval the code
 		eval($GLOBALS['template_eval'][$template]);
-	}
+	} // END - if
 
 	// Do we have some content to output or return?
 	if (!empty($ret)) {
-- 
2.39.5