Merge pull request joomla#416 from Bakual/staging

Default Layout should not be set in JController->display() as it's already been set in the JView Constructor
andreatarr · Oct 19, 2011 · 9cffa3c · 9cffa3c
2 parents d4d956d + 19d728a
commit 9cffa3c
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/libraries/joomla/application/component/controller.php b/libraries/joomla/application/component/controller.php
@@ -663,7 +663,7 @@ public function display($cachable = false, $urlparams = false)
 		$viewName = JRequest::getCmd('view', $this->default_view);
 		$viewLayout = JRequest::getCmd('layout', 'default');
 
-		$view = $this->getView($viewName, $viewType, '', array('base_path' => $this->basePath));
+		$view = $this->getView($viewName, $viewType, '', array('base_path' => $this->basePath, 'layout' => $viewLayout));
 
 		// Get/Create the model
 		if ($model = $this->getModel($viewName))
@@ -672,9 +672,6 @@ public function display($cachable = false, $urlparams = false)
 			$view->setModel($model, true);
 		}
 
-		// Set the layout
-		$view->setLayout($viewLayout);
-
 		$view->assignRef('document', $document);
 
 		$conf = JFactory::getConfig();