{ifset} macro can also check block existence ( {ifset #head} {/ifset} )

redhead · Feb 5, 2011 · 274a8f7 · 274a8f7
1 parent cb93254
commit 274a8f7
Showing 1 changed file with 24 additions and 1 deletion.
diff --git a/Nette/Templates/Filters/LatteMacros.php b/Nette/Templates/Filters/LatteMacros.php
@@ -72,7 +72,7 @@ class LatteMacros extends Nette\Object
 		'elseif' => '<?php elseif (%%): ?>',
 		'else' => '<?php else: ?>',
 		'/if' => '<?php endif ?>',
-		'ifset' => '<?php if (isset(%%)): ?>',
+		'ifset' => '<?php if (isset(%:macroIfset%)): ?>',
 		'/ifset' => '<?php endif ?>',
 		'elseifset' => '<?php elseif (isset(%%)): ?>',
 		'foreach' => '<?php foreach (%:macroForeach%): ?>',
@@ -705,6 +705,29 @@ public function macroCache($content)
 
 
 
+	/**
+	 * {ifset ...}
+	 */
+	public function macroIfset($content)
+	{
+		$s = "";
+		$i = 0;
+		while(($name = $this->fetchToken($content)) != null) {
+			if($i != 0)
+				$s .= ',';
+			if(String::startsWith($name, '#')) {
+				$name = ltrim($name, '#');
+				$s .= "\$_l->blocks['$name']";
+			} else {
+				$s .= $name;
+			}
+			$i++;
+		}
+		return $s;
+	}
+
+
+
 	/**
 	 * {foreach ...}
 	 */