From 25015ecc0b27945aebde5235a93c125a3f3984d9 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 18 Apr 2003 11:07:50 +0000
Subject: Revert INCLUDE template change, fixed attachment display.

git-svn-id: file:///svn/phpbb/trunk@3882 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/template.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/template.php')

diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index 888cdb2905..82eea9170a 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -231,7 +231,7 @@ class Template {
 		$this->files[$handle] = $this->make_filename($filename);
 		$_str = '';
 
-		if (!($this->compile_load($_str, $handle, true)))
+		if (!($this->compile_load($_str, $handle, false)))
 		{
 			global $user, $phpEx;
 
@@ -243,7 +243,7 @@ class Template {
 			$this->compiled_code[$handle] = $this->compile($this->uncompiled_code[$handle]);
 			$this->compile_write($handle, $this->compiled_code[$handle]);
 
-			eval($this->compiled_code[$handle]);
+			return $handle;
 		}
 	}
 
@@ -368,7 +368,8 @@ class Template {
 				case 'INCLUDE':
 					$temp = '';
 					list(, $temp) = each($include_blocks);
-					$compile_blocks[] = "// INCLUDE $temp\n\$this->assign_from_include('" . $temp . "');\n";
+					$compile_blocks[] = "// INCLUDE $temp\ninclude('" . $this->cachedir . $temp . ".' . \$phpEx);\n";
+					$this->assign_from_include($temp);
 					break;
 /*				case 'INCLUDEPHP':
 					$compile_blocks[] = '// INCLUDEPHP ' . $blocks[2][$curr_tb] . "\n" . $this->compile_tag_include_php($blocks[2][$curr_tb]);
-- 
cgit v1.2.1