From 0b21622734e082b052cfe3e8dadd79fd18c48646 Mon Sep 17 00:00:00 2001
From: gwoo <gwoo@cakephp.org>
Date: Sat, 22 Dec 2007 02:04:26 +0000
Subject: [PATCH] allowing templates to override layout, but only when property
 is used, if layout is passed to Controller::render(); it will be used, closes
 #3759

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6190 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/view/view.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 6064f45ad..916ccef35 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -326,10 +326,6 @@ class View extends Object {
 
 		$out = null;
 
-		if ($layout === null) {
-			$layout = $this->layout;
-		}
-
 		if ($file != null) {
 			$action = $file;
 		}
@@ -343,6 +339,9 @@ class View extends Object {
 			}
 		}
 
+		if ($layout === null) {
+			$layout = $this->layout;
+		}
 
 		if ($out !== false) {
 			if ($layout && $this->autoLayout) {