// Change display_header and display_footer behavior on BackOffice

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9710 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-28 12:58:13 +00:00
parent 7371c301ae
commit 9fb10416f4
2 changed files with 13 additions and 7 deletions
@@ -122,10 +122,18 @@ abstract class ControllerCore
 	{
 		$this->init();

-		if ($this->checkAccess())
+		// postProcess handles ajaxProcess
+		$this->postProcess();
+		
+		if ($this->display_header || (isset($this->className) && $this->className))
 		{
-			if ($this->ajax && method_exists($this, 'ajaxPreprocess'))
-				$this->ajaxPreProcess();
+			$this->setMedia();
+			$this->initHeader();
+		}
+	
+		$this->initContent();
+		if ($this->display_footer || (isset($this->className) && $this->className))
+			$this->initFooter();

 			// postProcess handles ajaxProcess
 			$this->postProcess();