14/05/2010

- bugfix compile new config files if compile_check and force_compile = false
- added variable static classes names to template syntax
This commit is contained in:
Uwe.Tews
2010-05-14 13:45:04 +00:00
parent 3197470ca5
commit a15c0f85d1
3 changed files with 738 additions and 751 deletions

View File

@@ -1,3 +1,7 @@
14/05/2010
- bugfix compile new config files if compile_check and force_compile = false
- added variable static classes names to template syntax
11/05/2010
- bugfix make sure that the cache resource is loaded in all conditions when template methods getCached... are called externally
- reverted the change 0f 30/04/2010. With the exception of forward references template functions can be again called by a standard tag.

View File

@@ -172,7 +172,7 @@ class Smarty_Internal_Config {
public function mustCompile ()
{
return $this->mustCompile === null ?
$this->mustCompile = ($this->smarty->force_compile || $this->smarty->compile_check && $this->getCompiledTimestamp () < $this->getTimestamp ()):
$this->mustCompile = ($this->smarty->force_compile || $this->getCompiledTimestamp () === false || $this->smarty->compile_check && $this->getCompiledTimestamp () < $this->getTimestamp ()):
$this->mustCompile;
}
/**
@@ -243,7 +243,7 @@ class Smarty_Internal_Config {
if ($this->mustCompile()) {
$this->compileConfigSource();
}
include($this->getCompiledFilepath ());
include($this->getCompiledFilepath ());
// copy global config vars
foreach ($_config_vars['vars'] as $variable => $value) {
if ($this->smarty->config_overwrite || !isset($scope->config_vars[$variable])) {

File diff suppressed because it is too large Load Diff