From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6
---
server/lib/classes/tpl.inc.php | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/server/lib/classes/tpl.inc.php b/server/lib/classes/tpl.inc.php
index f64567f..af2e0da 100644
--- a/server/lib/classes/tpl.inc.php
+++ b/server/lib/classes/tpl.inc.php
@@ -967,7 +967,9 @@
// check fullpath first..
$fullpath = $filepath.'/'.$filename;
- if (is_file($fullpath)) return $fullpath;
+ if (is_file($fullpath)) {
+ return $fullpath;
+ }
// ..then check for relative path for current directory..
if (!empty($this->_currentincludedir)) {
@@ -992,17 +994,23 @@
// ..then check path from TEMPLATE_DIR..
if (!empty($this->OPTIONS['TEMPLATE_DIR'])) {
$fullpath = realpath($this->OPTIONS['TEMPLATE_DIR'].'/'.$filepath.'/'.$filename);
- if (is_file($fullpath)) return $fullpath;
+ if (is_file($fullpath)) {
+ return $fullpath;
+ }
}
// ..then check relative path from executing php script..
$fullpath = realpath($filepath.'/'.$filename);
- if (is_file($fullpath)) return $fullpath;
+ if (is_file($fullpath)) {
+ return $fullpath;
+ }
// ..then check path from template file.
if (!empty($this->VLIBTEMPLATE_ROOT)) {
$fullpath = realpath($this->VLIBTEMPLATE_ROOT.'/'.$filepath.'/'.$filename);
- if (is_file($fullpath)) return $fullpath;
+ if (is_file($fullpath)) {
+ return $fullpath;
+ }
}
return false; // uh oh, file not found
@@ -1339,10 +1347,10 @@
* @return boolean true/false
*/
function _intParse () {
- $mqrt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
+ //$mqrt = get_magic_quotes_runtime();
+ //set_magic_quotes_runtime(0);
$this->_tmplfilep = '?>'.$this->_getData($this->_tmplfilename).'<?php return true;';
- set_magic_quotes_runtime($mqrt);
+ //set_magic_quotes_runtime($mqrt);
return true;
}
--
Gitblit v1.9.1