diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-18 16:04:07 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-18 16:04:07 +0100 |
commit | 628e565a6c5ee52341ba6de0b5ecf6495cbb78f8 (patch) | |
tree | 737c1027334a211b62b4a278f87be80bb7e17a4c /library/Smarty/libs/Smarty.class.php | |
parent | a721f39945bf3213c4305a389946c464b831a5f9 (diff) | |
parent | 84bf7058119bb2ed48358678be9c212a66c8cb83 (diff) | |
download | volse-hubzilla-628e565a6c5ee52341ba6de0b5ecf6495cbb78f8.tar.gz volse-hubzilla-628e565a6c5ee52341ba6de0b5ecf6495cbb78f8.tar.bz2 volse-hubzilla-628e565a6c5ee52341ba6de0b5ecf6495cbb78f8.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'library/Smarty/libs/Smarty.class.php')
-rw-r--r-- | library/Smarty/libs/Smarty.class.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/library/Smarty/libs/Smarty.class.php b/library/Smarty/libs/Smarty.class.php index ac09d0a43..17457131c 100644 --- a/library/Smarty/libs/Smarty.class.php +++ b/library/Smarty/libs/Smarty.class.php @@ -27,7 +27,7 @@ * @author Uwe Tews * @author Rodney Rehm * @package Smarty - * @version 3.1.28-dev + * @version 3.1.28 */ /** @@ -118,7 +118,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * smarty version */ - const SMARTY_VERSION = '3.1.28-dev/77'; + const SMARTY_VERSION = '3.1.28'; /** * define variable scopes @@ -1094,8 +1094,12 @@ class Smarty extends Smarty_Internal_TemplateBase $tpl->tpl_vars[$_key] = new Smarty_Variable($_val); } } - if ($this->debugging) { + if ($this->debugging || $this->debugging_ctrl == 'URL') { $tpl->smarty->_debug = new Smarty_Internal_Debug(); + // check URL debugging control + if (!$this->debugging && $this->debugging_ctrl == 'URL') { + $tpl->smarty->_debug->debugUrl($tpl->smarty); + } } return $tpl; } |