aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-08-20 14:53:25 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-08-20 14:53:25 +0000
commitedc5061f1df0fd3ce6f307b91f309a52e037cf73 (patch)
tree4e56ffc61cc70d5e04ae5267cdf6b6aaacf75022 /phpBB/includes
parent74879efcb5c8af253c1d4bdbe97c8065681a1778 (diff)
downloadforums-edc5061f1df0fd3ce6f307b91f309a52e037cf73.tar
forums-edc5061f1df0fd3ce6f307b91f309a52e037cf73.tar.gz
forums-edc5061f1df0fd3ce6f307b91f309a52e037cf73.tar.bz2
forums-edc5061f1df0fd3ce6f307b91f309a52e037cf73.tar.xz
forums-edc5061f1df0fd3ce6f307b91f309a52e037cf73.zip
Check for valid $template_path in includes/template.php - Bug #50055
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10036 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/template.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index fece30e4cd..80434aca4c 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -94,6 +94,12 @@ class template
{
global $phpbb_root_path, $user;
+ // Make sure $template_path has no ending slash
+ if (substr($template_path, -1) == '/')
+ {
+ $template_path = substr($template_path, 0, -1);
+ }
+
$this->root = $template_path;
$this->cachepath = $phpbb_root_path . 'cache/ctpl_' . str_replace('_', '-', $template_name) . '_';
$user->theme['template_storedb'] = false;