aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-05-19 12:18:16 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2011-05-19 12:18:16 -0400
commit6ae5a64f6c12937367ad56cac5e38104b445c780 (patch)
treeab59d96e0fab54b90c79e87ac092aba65231fa61 /phpBB/includes
parentefda4da19fedd0e5bd67835034cfc689b8f5a740 (diff)
downloadforums-6ae5a64f6c12937367ad56cac5e38104b445c780.tar
forums-6ae5a64f6c12937367ad56cac5e38104b445c780.tar.gz
forums-6ae5a64f6c12937367ad56cac5e38104b445c780.tar.bz2
forums-6ae5a64f6c12937367ad56cac5e38104b445c780.tar.xz
forums-6ae5a64f6c12937367ad56cac5e38104b445c780.zip
[feature/template-engine] Fixed absolute path PHP includes, added test.
PHPBB3-9726
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/template.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index e99b9a8c6c..935605b12a 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -529,7 +529,14 @@ class phpbb_template
*/
public function _php_include($filename)
{
- $file = $this->phpbb_root_path . $filename;
+ if (is_absolute($filename))
+ {
+ $file = $filename;
+ }
+ else
+ {
+ $file = $this->phpbb_root_path . $filename;
+ }
if (!file_exists($file))
{