From 91fa976889a8113d430fedcac92c9afad176f510 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Thu, 5 May 2016 10:58:52 +0200 Subject: [PATCH] UIMacros: do not use layout for templates without blocks --- src/Bridges/ApplicationLatte/UIMacros.php | 2 +- tests/Bridges.Latte/Template.getParentName().phpt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Bridges/ApplicationLatte/UIMacros.php b/src/Bridges/ApplicationLatte/UIMacros.php index d2f136ac3..b5d63c8d7 100644 --- 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 index b75969b40..667bdde44 100644 --- 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}',