smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 10:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix $smarty->debugging_ctrl = 'URL' did not work (forum topic 25811)

Browse Source
This commit is contained in:
uwetews
2015-12-13 10:16:10 +01:00
parent 6dc9196c35
commit 7e521a92d9
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -1,6 +1,7 @@
 ===== 3.1.28-dev===== (xx.xx.2015)  ===== 3.1.28-dev===== (xx.xx.2015)
13.12.2015 13.12.2015
- bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819) - bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819)
- bugfix $smarty->debugging_ctrl = 'URL' did not work (forum topic 25811)
09.12.2015 09.12.2015
- bugix Smarty did fail under PHP 7.0.0 with use_include_path = true; - bugix Smarty did fail under PHP 7.0.0 with use_include_path = true;

8
libs/Smarty.class.php
View File

@@ -118,7 +118,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.28-dev/80'; const SMARTY_VERSION = '3.1.28-dev/81';
/** /**
* define variable scopes * define variable scopes
@@ -1094,8 +1094,12 @@ class Smarty extends Smarty_Internal_TemplateBase
$tpl->tpl_vars[$_key] = new Smarty_Variable($_val); $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(); $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; return $tpl;
} }

18
libs/sysplugins/smarty_internal_debug.php
View File

@@ -399,31 +399,31 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
/** /**
* handle 'URL' debugging mode * handle 'URL' debugging mode
* *
* @param Smarty_Internal_Template $_template * @param Smarty $smarty
*/ */
public function debugUrl(Smarty_Internal_Template $_template) public function debugUrl(Smarty $smarty)
{ {
if (isset($_SERVER['QUERY_STRING'])) { if (isset($_SERVER['QUERY_STRING'])) {
$_query_string = $_SERVER['QUERY_STRING']; $_query_string = $_SERVER['QUERY_STRING'];
} else { } else {
$_query_string = ''; $_query_string = '';
} }
if (false !== strpos($_query_string, $_template->smarty->smarty_debug_id)) { if (false !== strpos($_query_string, $smarty->smarty_debug_id)) {
if (false !== strpos($_query_string, $_template->smarty->smarty_debug_id . '=on')) { if (false !== strpos($_query_string, $smarty->smarty_debug_id . '=on')) {
// enable debugging for this browser session // enable debugging for this browser session
setcookie('SMARTY_DEBUG', true); setcookie('SMARTY_DEBUG', true);
$_template->smarty->debugging = true; $smarty->debugging = true;
} elseif (false !== strpos($_query_string, $_template->smarty->smarty_debug_id . '=off')) { } elseif (false !== strpos($_query_string, $smarty->smarty_debug_id . '=off')) {
// disable debugging for this browser session // disable debugging for this browser session
setcookie('SMARTY_DEBUG', false); setcookie('SMARTY_DEBUG', false);
$_template->smarty->debugging = false; $smarty->debugging = false;
} else { } else {
// enable debugging for this page // enable debugging for this page
$_template->smarty->debugging = true; $smarty->debugging = true;
} }
} else { } else {
if (isset($_COOKIE['SMARTY_DEBUG'])) { if (isset($_COOKIE['SMARTY_DEBUG'])) {
$_template->smarty->debugging = true; $smarty->debugging = true;
} }
} }
} }

4
libs/sysplugins/smarty_internal_template.php
View File

@@ -138,10 +138,6 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
} }
throw new SmartyException("Unable to load template {$this->source->type} '{$this->source->name}'{$parent_resource}"); throw new SmartyException("Unable to load template {$this->source->type} '{$this->source->name}'{$parent_resource}");
} }
// check URL debugging control
if (!$this->smarty->debugging && $this->smarty->debugging_ctrl == 'URL') {
$this->smarty->_debug->debugUrl($this);
}
// disable caching for evaluated code // disable caching for evaluated code
if ($this->source->handler->recompiled) { if ($this->source->handler->recompiled) {
$this->caching = false; $this->caching = false;