diff --git a/change_log.txt b/change_log.txt index 335c91fa..8f8d20a2 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,7 @@  ===== 3.1.30-dev ===== (xx.xx.xx) + 14.07.2016 + - bugfix wrong parameter on compileAllTemplates() and compileAllConfig() https://github.com/smarty-php/smarty/issues/231 + 13.07.2016 - bugfix PHP 7 compatibility on registered compiler plugins https://github.com/smarty-php/smarty/issues/241 - update testInstall() https://github.com/smarty-php/smarty/issues/248https://github.com/smarty-php/smarty/issues/248 diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 53545383..9725cab5 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -108,8 +108,8 @@ require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_resource_base.php'; * * @method int clearAllCache(int $exp_time = null, string $type = null) * @method int clearCache(string $template_name, string $cache_id = null, string $compile_id = null, int $exp_time = null, string $type = null) - * @method int compileAllTemplates(Smarty $smarty, string $extension = '.tpl', bool $force_compile = false, int $time_limit = 0, int $max_errors = null) - * @method int compileAllConfig(Smarty $smarty, string $extension = '.conf', bool $force_compile = false, int $time_limit = 0, int $max_errors = null) + * @method int compileAllTemplates(string $extension = '.tpl', bool $force_compile = false, int $time_limit = 0, int $max_errors = null) + * @method int compileAllConfig(string $extension = '.conf', bool $force_compile = false, int $time_limit = 0, int $max_errors = null) * @method int clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null) */ class Smarty extends Smarty_Internal_TemplateBase @@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * smarty version */ - const SMARTY_VERSION = '3.1.30-dev/79'; + const SMARTY_VERSION = '3.1.30-dev/80'; /** * define variable scopes diff --git a/libs/sysplugins/smarty_internal_method_compileallconfig.php b/libs/sysplugins/smarty_internal_method_compileallconfig.php index b8e8f47e..767031bd 100644 --- a/libs/sysplugins/smarty_internal_method_compileallconfig.php +++ b/libs/sysplugins/smarty_internal_method_compileallconfig.php @@ -17,7 +17,6 @@ class Smarty_Internal_Method_CompileAllConfig extends Smarty_Internal_Method_Com * * @api Smarty::compileAllConfig() * - * @param \Smarty $dummy smarty object of calling instance * @param \Smarty $smarty passed smarty object * @param string $extension file extension * @param bool $force_compile force all to recompile @@ -26,8 +25,8 @@ class Smarty_Internal_Method_CompileAllConfig extends Smarty_Internal_Method_Com * * @return int number of template files recompiled */ - public function compileAllConfig(Smarty $dummy, Smarty $smarty, $extension = '.conf', $force_compile = false, - $time_limit = 0, $max_errors = null) + public function compileAllConfig(Smarty $smarty, $extension = '.conf', $force_compile = false, $time_limit = 0, + $max_errors = null) { return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors, true); } diff --git a/libs/sysplugins/smarty_internal_method_compilealltemplates.php b/libs/sysplugins/smarty_internal_method_compilealltemplates.php index b92ee253..b38544eb 100644 --- a/libs/sysplugins/smarty_internal_method_compilealltemplates.php +++ b/libs/sysplugins/smarty_internal_method_compilealltemplates.php @@ -23,7 +23,6 @@ class Smarty_Internal_Method_CompileAllTemplates * * @api Smarty::compileAllTemplates() * - * @param \Smarty $dummy smarty object of calling instance * @param \Smarty $smarty passed smarty object * @param string $extension file extension * @param bool $force_compile force all to recompile @@ -62,7 +61,8 @@ class Smarty_Internal_Method_CompileAllTemplates $sourceDir = $isConfig ? $smarty->getConfigDir() : $smarty->getTemplateDir(); // loop over array of source directories foreach ($sourceDir as $_dir) { - $_dir_1 = new RecursiveDirectoryIterator($_dir, defined('FilesystemIterator::FOLLOW_SYMLINKS') ? FilesystemIterator::FOLLOW_SYMLINKS : 0); + $_dir_1 = new RecursiveDirectoryIterator($_dir, defined('FilesystemIterator::FOLLOW_SYMLINKS') ? + FilesystemIterator::FOLLOW_SYMLINKS : 0); $_dir_2 = new RecursiveIteratorIterator($_dir_1); foreach ($_dir_2 as $_fileinfo) { $_file = $_fileinfo->getFilename();