1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

merge revisions i missed... hopefully not breaking things - did not check every change.

git-svn-id: file:///svn/phpbb/trunk@9077 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2008-11-22 19:38:25 +00:00
parent 47b4b83468
commit d46e8e6f98
33 changed files with 161 additions and 59 deletions

View File

@@ -67,7 +67,7 @@ class template
public function set_custom_template($template_path, $template_name)
{
$this->root = $template_path;
$this->cachepath = PHPBB_ROOT_PATH . 'cache/ctpl_' . $template_name . '_';
$this->cachepath = PHPBB_ROOT_PATH . 'cache/ctpl_' . str_replace('_', '-', $template_name) . '_';
return true;
}
@@ -174,7 +174,7 @@ class template
}
else
{
// if we could not eval AND the file exists, something horrific has occured
// if we could not eval AND the file exists, something horrific has occured
return false;
}