mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Revert INCLUDE template change, fixed attachment display.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@3882 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2003-04-18 11:07:50 +00:00
parent 5286de6f0e
commit 25015ecc0b
2 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/template.php
View File

@@ -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]);