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

- cleanup of _getSmartyObj()

Browse Source
This commit is contained in:
Uwe Tews
2017-08-05 23:08:59 +02:00
parent 5cc9b27784
commit 30526520b6
4 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -2,6 +2,7 @@
05.8.2017 05.8.2017
- bugfix wordwrap modifier could fail if used in nocache code. - bugfix wordwrap modifier could fail if used in nocache code.
converted plugin file shared.mb_wordwrap.php into modifier.mb_wordwrap.php converted plugin file shared.mb_wordwrap.php into modifier.mb_wordwrap.php
- cleanup of _getSmartyObj()
31.7.2017 31.7.2017
- Call clearstatcache() after mkdir() failure https://github.com/smarty-php/smarty/pull/379 - Call clearstatcache() after mkdir() failure https://github.com/smarty-php/smarty/pull/379

12
libs/Smarty.class.php
View File

@@ -108,7 +108,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.32-dev-17'; const SMARTY_VERSION = '3.1.32-dev-18';
/** /**
* define variable scopes * define variable scopes
@@ -1253,16 +1253,6 @@ class Smarty extends Smarty_Internal_TemplateBase
Smarty_Internal_Template::$tplObjCache = array(); Smarty_Internal_Template::$tplObjCache = array();
} }
/**
* Get Smarty object
*
* @return Smarty
*/
public function _getSmartyObj()
{
return $this;
}
/** /**
* @param boolean $compile_check * @param boolean $compile_check
*/ */

2
libs/sysplugins/smarty_internal_data.php
View File

@@ -266,7 +266,7 @@ class Smarty_Internal_Data
*/ */
public function _getSmartyObj() public function _getSmartyObj()
{ {
return $this->smarty; return $this->_objType === 1 ? $this : $this->smarty;
} }
/** /**

1
libs/sysplugins/smarty_internal_templatebase.php
View File

@@ -42,7 +42,6 @@
* @method Smarty_Internal_TemplateBase unregisterPlugin(string $type, string $name) * @method Smarty_Internal_TemplateBase unregisterPlugin(string $type, string $name)
* @method Smarty_Internal_TemplateBase unregisterFilter(string $type, mixed $callback) * @method Smarty_Internal_TemplateBase unregisterFilter(string $type, mixed $callback)
* @method Smarty_Internal_TemplateBase unregisterResource(string $name) * @method Smarty_Internal_TemplateBase unregisterResource(string $name)
* @method Smarty _getSmartyObj()
*/ */
abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
{ {