Fixed regression in 07e1dd

lib/plugins/builtin/blocks/dynamic.php

@@ -29,28 +29,28 @@ class Dwoo_Plugin_dynamic extends Dwoo_Block_Plugin implements Dwoo_ICompilable_
 	{
 		try {
 			$compiler->findBlock('dynamic');
-			$output = Dwoo_Compiler::PHP_OPEN .
-				'if($doCache) {'."\n\t".
-					'echo \'<dwoo:dynamic_\'.$dynamicId.\'>'.
-					str_replace('\'', '\\\'', $content) .
-					'</dwoo:dynamic_\'.$dynamicId.\'>\';'.
-				"\n} else {\n\t";
-					if(substr($content, 0, strlen(Dwoo_Compiler::PHP_OPEN)) == Dwoo_Compiler::PHP_OPEN) {
-						$output .= substr($content, strlen(Dwoo_Compiler::PHP_OPEN));
-					} else {
-						$output .= Dwoo_Compiler::PHP_CLOSE . $content;
-					}
-					if(substr($output, -strlen(Dwoo_Compiler::PHP_CLOSE)) == Dwoo_Compiler::PHP_CLOSE) {
-						$output = substr($output, 0, -strlen(Dwoo_Compiler::PHP_CLOSE));
-					} else {
-						$output .= Dwoo_Compiler::PHP_OPEN;
-					}
-				$output .= "\n}". Dwoo_Compiler::PHP_CLOSE;
-
-			return $output;
-		} catch (Dwoo_Compilation_Exception $e) {
 			return $content;
+		} catch (Dwoo_Compilation_Exception $e) {
 		}
+		$output = Dwoo_Compiler::PHP_OPEN .
+			'if($doCache) {'."\n\t".
+				'echo \'<dwoo:dynamic_\'.$dynamicId.\'>'.
+				str_replace('\'', '\\\'', $content) .
+				'</dwoo:dynamic_\'.$dynamicId.\'>\';'.
+			"\n} else {\n\t";
+				if(substr($content, 0, strlen(Dwoo_Compiler::PHP_OPEN)) == Dwoo_Compiler::PHP_OPEN) {
+					$output .= substr($content, strlen(Dwoo_Compiler::PHP_OPEN));
+				} else {
+					$output .= Dwoo_Compiler::PHP_CLOSE . $content;
+				}
+				if(substr($output, -strlen(Dwoo_Compiler::PHP_CLOSE)) == Dwoo_Compiler::PHP_CLOSE) {
+					$output = substr($output, 0, -strlen(Dwoo_Compiler::PHP_CLOSE));
+				} else {
+					$output .= Dwoo_Compiler::PHP_OPEN;
+				}
+			$output .= "\n}". Dwoo_Compiler::PHP_CLOSE;
+
+		return $output;
 	}
 
 	public static function unescape($output, $dynamicId, $compiledFile)

tests/BlockTests.php

@@ -103,14 +103,31 @@ BAZZ       {/capture}{$foo}');
 	public function testDynamic()
 	{
 		$preTime = time();
-		$tpl = new Dwoo_Template_String('{$pre}{dynamic}{$pre}{/}', 10, 'testDynamic');
+		$tpl = new Dwoo_Template_String('t{$pre}{dynamic}{$pre}{/}', 10, 'testDynamic');
 		$tpl->forceCompilation();
 
-		$this->assertEquals($preTime . $preTime, $this->dwoo->get($tpl, array('pre'=>$preTime), $this->compiler));
+		$this->assertEquals('t'.$preTime . $preTime, $this->dwoo->get($tpl, array('pre'=>$preTime), $this->compiler));
 
 		sleep(1);
 		$postTime = time();
-		$this->assertEquals($preTime . $postTime, $this->dwoo->get($tpl, array('pre'=>$postTime), $this->compiler));
+		$this->assertEquals('t'.$preTime . $postTime, $this->dwoo->get($tpl, array('pre'=>$postTime), $this->compiler));
+
+		// fixes the init call not being called (which is normal)
+		$fixCall = new Dwoo_Plugin_dynamic($this->dwoo);
+		$fixCall->init('');
+	}
+
+	public function testDynamicNested()
+	{
+		$preTime = time();
+		$tpl = new Dwoo_Template_String('t{$pre}{dynamic}{$pre}{dynamic}{$pre}{/}{/}', 10, 'testDynamicNested');
+		$tpl->forceCompilation();
+
+		$this->assertEquals('t'.$preTime . $preTime . $preTime, $this->dwoo->get($tpl, array('pre'=>$preTime), $this->compiler));
+
+		sleep(1);
+		$postTime = time();
+		$this->assertEquals('t'.$preTime . $postTime . $postTime, $this->dwoo->get($tpl, array('pre'=>$postTime), $this->compiler));
 
 		// fixes the init call not being called (which is normal)
 		$fixCall = new Dwoo_Plugin_dynamic($this->dwoo);