aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/template.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-11-22 19:38:25 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-11-22 19:38:25 +0000
commitd46e8e6f98054fc58a126c865184369198d9a2ed (patch)
treef84899714e91ff360dcf16122d0ef723f5cefa15 /phpBB/includes/template.php
parent47b4b8346813312f99509d3f9d877c9cbf81b88b (diff)
downloadforums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar
forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar.gz
forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar.bz2
forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar.xz
forums-d46e8e6f98054fc58a126c865184369198d9a2ed.zip
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
Diffstat (limited to 'phpBB/includes/template.php')
-rw-r--r--phpBB/includes/template.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index 9e0ff6c02a..814d6d2e50 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -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;
}