[limb-svn] r6528 - 3.x/trunk/limb/macro/src

svn at limb-project.com svn at limb-project.com
Mon Nov 19 21:21:06 MSK 2007


Author: pachanga
Date: 2007-11-19 21:21:05 +0300 (Mon, 19 Nov 2007)
New Revision: 6528
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6528

Modified:
   3.x/trunk/limb/macro/src/lmbMacroTemplate.class.php
Log:
-- removing contraversial 'auto' value for forcecompile

Modified: 3.x/trunk/limb/macro/src/lmbMacroTemplate.class.php
===================================================================
--- 3.x/trunk/limb/macro/src/lmbMacroTemplate.class.php	2007-11-19 07:45:09 UTC (rev 6527)
+++ 3.x/trunk/limb/macro/src/lmbMacroTemplate.class.php	2007-11-19 18:21:05 UTC (rev 6528)
@@ -63,26 +63,9 @@
     {
       $this->compiled_file = $this->locator->locateCompiledTemplate($this->file);
 
-      $need_compile = false;	
-
-      if (true === $this->config->isForceCompile()) {
-
-		$need_compile = true;
-		$source_file = $this->locator->locateSourceTemplate($this->file);
-
-      } else if ('auto' == $this->config->isForceCompile()) {
-
- 		if (filemtime($source_file = $this->locator->locateSourceTemplate($this->file)) > filemtime($this->compiled_file)) {
-
-			$need_compile = true;
-
-		}
-
-      }
-
-      if($need_compile || !file_exists($this->compiled_file))
+      if($this->config->isForceCompile() || !file_exists($this->compiled_file))
       {
-        if(!$source_file)
+        if(!$source_file = $this->locator->locateSourceTemplate($this->file))
           throw new lmbMacroException('Template source file not found', array('file_name' => $this->file));
 
         $macro_executor_class = 'MacroTemplateExecutor' . uniqid();//think about evaling this instance



More information about the limb-svn mailing list