- bugfix avoid opcache_invalidate to result in ErrorException when opcache.restrict_api is not empty https://github.com/smarty-php/smarty/pull/244

This commit is contained in:
uwetews
2016-07-18 19:45:30 +02:00
parent 92945eaf12
commit d854219696
6 changed files with 6 additions and 5 deletions

View File

@@ -2,6 +2,7 @@
18.07.2016 18.07.2016
- bugfix {foreach} if key variable and item@key attribute have been used both the key variable was not updated https://github.com/smarty-php/smarty/issues/254 - bugfix {foreach} if key variable and item@key attribute have been used both the key variable was not updated https://github.com/smarty-php/smarty/issues/254
- bugfix modifier on plugins like {plugin|modifier ... } did fail when the plugin does return an array https://github.com/smarty-php/smarty/issues/228 - bugfix modifier on plugins like {plugin|modifier ... } did fail when the plugin does return an array https://github.com/smarty-php/smarty/issues/228
- bugfix avoid opcache_invalidate to result in ErrorException when opcache.restrict_api is not empty https://github.com/smarty-php/smarty/pull/244
14.07.2016 14.07.2016
- bugfix wrong parameter on compileAllTemplates() and compileAllConfig() https://github.com/smarty-php/smarty/issues/231 - bugfix wrong parameter on compileAllTemplates() and compileAllConfig() https://github.com/smarty-php/smarty/issues/231

View File

@@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.30-dev/82'; const SMARTY_VERSION = '3.1.30-dev/83';
/** /**
* define variable scopes * define variable scopes

View File

@@ -108,7 +108,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
if ($_template->smarty->ext->_writeFile->writeFile($_template->cached->filepath, $content, if ($_template->smarty->ext->_writeFile->writeFile($_template->cached->filepath, $content,
$_template->smarty) === true $_template->smarty) === true
) { ) {
if (function_exists('opcache_invalidate')) { if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) {
opcache_invalidate($_template->cached->filepath, true); opcache_invalidate($_template->cached->filepath, true);
} elseif (function_exists('apc_compile_file')) { } elseif (function_exists('apc_compile_file')) {
apc_compile_file($_template->cached->filepath); apc_compile_file($_template->cached->filepath);

View File

@@ -115,7 +115,7 @@ class Smarty_Internal_Extension_Clear
} }
} }
$_count += @unlink((string) $_file) ? 1 : 0; $_count += @unlink((string) $_file) ? 1 : 0;
if (function_exists('opcache_invalidate')) { if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) {
opcache_invalidate((string) $_file, true); opcache_invalidate((string) $_file, true);
} }
} }

View File

@@ -109,7 +109,7 @@ class Smarty_Internal_Method_ClearCompiledTemplate
if ($unlink && @unlink($_filepath)) { if ($unlink && @unlink($_filepath)) {
$_count ++; $_count ++;
if (function_exists('opcache_invalidate')) { if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) {
opcache_invalidate($_filepath, true); opcache_invalidate($_filepath, true);
} }
} }

View File

@@ -124,7 +124,7 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
*/ */
private function loadCompiledTemplate(Smarty_Internal_Template $_smarty_tpl) private function loadCompiledTemplate(Smarty_Internal_Template $_smarty_tpl)
{ {
if (function_exists('opcache_invalidate')) { if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) {
opcache_invalidate($this->filepath, true); opcache_invalidate($this->filepath, true);
} elseif (function_exists('apc_compile_file')) { } elseif (function_exists('apc_compile_file')) {
apc_compile_file($this->filepath); apc_compile_file($this->filepath);