// 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

classes/AdminController.php

@@ -832,7 +832,6 @@ class AdminControllerCore extends Controller
 			$page = $this->context->smarty->fetch($tpl);
 		else
 			$page = $this->context->smarty->fetch($this->template);
-
 		if ($this->content_only)
 			echo $page;
 		else
@@ -1070,12 +1069,11 @@ class AdminControllerCore extends Controller
 				return;
 			$this->content .= $this->initForm();
 		}
-		else if ($this->display != 'view')
+		elseif ($this->display != 'view' && !$this->ajax)
 		{
 			$this->content .= $this->initList();
 			$this->content .= $this->initOptions();
 		}
-
 		$this->context->smarty->assign(array(
 			'table' => $this->table,
 			'current' => self::$currentIndex,

classes/Controller.php

@@ -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->setMedia();
-				$this->ajaxPreProcess();
+			$this->initHeader();
+		}
+	
+		$this->initContent();
+		if ($this->display_footer || (isset($this->className) && $this->className))
+			$this->initFooter();
 
 			// postProcess handles ajaxProcess
 			$this->postProcess();