adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

allowing templates to override layout, but only when property is used, if layout is passed to Controller::render(); it will be used, closes #3759

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6190 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-12-22 02:04:26 +00:00
parent 98f454bc8a
commit 0b21622734
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cake/libs/view/view.php
View file

@ -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) {