UIMacros: do not use layout for templates without blocks

nette · May 5, 2016 · 91fa976 · 91fa976
1 parent 55210af
commit 91fa976
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Bridges/ApplicationLatte/UIMacros.php b/src/Bridges/ApplicationLatte/UIMacros.php
@@ -48,7 +48,7 @@ public static function install(Latte\Compiler $compiler)
 	public function initialize()
 	{
 		$this->getCompiler()->addMethod('getParentName', '
-		return !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter
+		return $this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter
 			? $this->params["_control"]->findLayoutTemplateFile() : NULL;
 		');
 	}

diff --git a/tests/Bridges.Latte/Template.getParentName().phpt b/tests/Bridges.Latte/Template.getParentName().phpt
@@ -24,13 +24,13 @@ $template = $latte->createTemplate(
 	'',
 	['_control' => new MockPresenter]
 );
-Assert::same('layout.latte', $template->getParentName());
+Assert::null($template->getParentName());
 
 $template = $latte->createTemplate(
 	'{block}...{/block}',
 	['_control' => new MockPresenter]
 );
-Assert::same('layout.latte', $template->getParentName());
+Assert::null($template->getParentName());
 
 $template = $latte->createTemplate(
 	'{block name}...{/block}',