Snippets: disable snippet mode when rendering snippets

src/Latte/Runtime/ISnippetBridge.php

@@ -21,6 +21,13 @@ interface ISnippetBridge
 	function isSnippetMode();
 
 
+	/**
+	 * @param  bool
+	 * @return void
+	 */
+	function setSnippetMode($snippetMode);
+
+
 	/**
 	 * @param  string
 	 * @return bool

src/Latte/Runtime/SnippetDriver.php

@@ -43,7 +43,7 @@ public function __construct(ISnippetBridge $bridge)
 
 	public function enter($name, $type)
 	{
-		if (!$this->bridge->isSnippetMode()) {
+		if (!$this->renderingSnippets) {
 			return;
 		}
 		$obStarted = FALSE;
@@ -63,7 +63,7 @@ public function enter($name, $type)
 
 	public function leave()
 	{
-		if (!$this->bridge->isSnippetMode()) {
+		if (!$this->renderingSnippets) {
 			return;
 		}
 		list($name, $obStarted) = array_pop($this->stack);
@@ -88,13 +88,15 @@ public function renderSnippets(array $blocks, array $params)
 			return FALSE;
 		}
 		$this->renderingSnippets = TRUE;
+		$this->bridge->setSnippetMode(FALSE);
 		foreach ($blocks as $name => $function) {
 			if ($name[0] !== '_' || !$this->bridge->needsRedraw(substr($name, 1))) {
 				continue;
 			}
 			$function = reset($function);
 			$function($params);
 		}
+		$this->bridge->setSnippetMode(TRUE);
 		$this->bridge->renderChildren();
 		return TRUE;
 	}

tests/Latte/mocks/SnippetBridge.php

@@ -17,6 +17,12 @@ public function isSnippetMode()
 	}
 
 
+	public function setSnippetMode($snippetMode)
+	{
+		$this->snippetMode = $snippetMode;
+	}
+
+
 	public function needsRedraw($name)
 	{
 		return $this->invalid === TRUE || isset($this->invalid[$name]);