diff --git a/libs/plugins/core.compile_template.php b/libs/plugins/core.compile_template.php deleted file mode 100644 index f0932e81..00000000 --- a/libs/plugins/core.compile_template.php +++ /dev/null @@ -1,62 +0,0 @@ -compiler_file)) { - require_once SMARTY_DIR . $this->compiler_file; - } else { - // use include_path - require_once $this->compiler_file; - } - - $smarty_compiler = new $this->compiler_class; - - $smarty_compiler->template_dir = $this->template_dir; - $smarty_compiler->compile_dir = $this->compile_dir; - $smarty_compiler->plugins_dir = $this->plugins_dir; - $smarty_compiler->config_dir = $this->config_dir; - $smarty_compiler->force_compile = $this->force_compile; - $smarty_compiler->caching = $this->caching; - $smarty_compiler->php_handling = $this->php_handling; - $smarty_compiler->left_delimiter = $this->left_delimiter; - $smarty_compiler->right_delimiter = $this->right_delimiter; - $smarty_compiler->_version = $this->_version; - $smarty_compiler->security = $this->security; - $smarty_compiler->secure_dir = $this->secure_dir; - $smarty_compiler->security_settings = $this->security_settings; - $smarty_compiler->trusted_dir = $this->trusted_dir; - $smarty_compiler->_reg_objects = &$this->_reg_objects; - $smarty_compiler->_plugins = &$this->_plugins; - $smarty_compiler->_tpl_vars = &$this->_tpl_vars; - $smarty_compiler->default_modifiers = $this->default_modifiers; - $smarty_compiler->compile_id = $this->_compile_id; - - if ($smarty_compiler->_compile_file($tpl_file, $template_source, $template_compiled)) { - return true; - } else { - $this->trigger_error($smarty_compiler->_error_msg); - return false; - } -} - - -/* vim: set expandtab: */ - -?> diff --git a/libs/plugins/core.display_debug_console.php b/libs/plugins/core.display_debug_console.php index 3686bd44..5e18f905 100644 --- a/libs/plugins/core.display_debug_console.php +++ b/libs/plugins/core.display_debug_console.php @@ -21,9 +21,9 @@ function smarty_core_display_debug_console($params, &$this) if(empty($this->debug_tpl)) { // set path to debug template from SMARTY_DIR - $this->debug_tpl = 'file:' . SMARTY_DIR . 'debug.tpl'; + $this->debug_tpl = SMARTY_DIR . 'debug.tpl'; if($this->security && is_file($this->debug_tpl)) { - $secure_dir[] = $this->debug_tpl; + $this->secure_dir[] = $this->debug_tpl; } } @@ -45,6 +45,8 @@ function smarty_core_display_debug_console($params, &$this) include($_compile_path); $_results = ob_get_contents(); ob_end_clean(); + } else { + $_results = ''; } $this->force_compile = $_force_compile_orig;