From 5d8cd94c1dae25a0d2c258dc01ddf780dc0a9c41 Mon Sep 17 00:00:00 2001 From: Uwe Tews Date: Thu, 26 Oct 2017 06:30:19 +0200 Subject: [PATCH] - optimization replace internal Smarty::$ds property by DIRECTORY_SEPARATOR --- libs/sysplugins/smarty_internal_compile_include_php.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libs/sysplugins/smarty_internal_compile_include_php.php b/libs/sysplugins/smarty_internal_compile_include_php.php index 77586da8b..ce96b7ec6 100644 --- a/libs/sysplugins/smarty_internal_compile_include_php.php +++ b/libs/sysplugins/smarty_internal_compile_include_php.php @@ -7,7 +7,6 @@ * @subpackage Compiler * @author Uwe Tews */ - /** * Smarty Internal Plugin Compile Insert Class * @@ -57,7 +56,6 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) } // check and get attributes $_attr = $this->getAttributes($compiler, $args); - /** @var Smarty_Internal_Template $_smarty_tpl * used in evaluated code */ @@ -74,8 +72,8 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) $_dir = $compiler->smarty->trusted_dir; } if (!empty($_dir)) { - foreach ((array) $_dir as $_script_dir) { - $_path = $compiler->smarty->_realpath($_script_dir . $compiler->smarty->ds . $_file, true); + foreach ((array)$_dir as $_script_dir) { + $_path = $compiler->smarty->_realpath($_script_dir . DIRECTORY_SEPARATOR . $_file, true); if (file_exists($_path)) { $_filepath = $_path; break; @@ -86,11 +84,9 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) if ($_filepath == false) { $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", null, true); } - if (isset($compiler->smarty->security_policy)) { $compiler->smarty->security_policy->isTrustedPHPDir($_filepath); } - if (isset($_attr[ 'assign' ])) { // output will be stored in a smarty variable instead of being displayed $_assign = $_attr[ 'assign' ]; @@ -101,7 +97,6 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) $_once = ''; } } - if (isset($_assign)) { return "assign({$_assign},ob_get_clean());\n?>"; } else {