From 3e3ff64cc5c0e7eb29004edb0e4404166d46e833 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Fri, 28 Oct 2011 13:27:20 +0000
Subject: [PATCH] // Fix merge error

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9713 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/Controller.php | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/classes/Controller.php b/classes/Controller.php
index 95545ed1c..2092d8555 100644
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -134,32 +134,20 @@ abstract class ControllerCore
 			}
 	
 			$this->initContent();
+			
 			if ($this->display_footer || (isset($this->className) && $this->className))
 				$this->initFooter();
 
-				// postProcess handles ajaxProcess
-				$this->postProcess();
-
-				if ($this->display_header)
-				{
-					$this->setMedia();
-					$this->initHeader();
-				}
-		
-				$this->initContent();
-				if ($this->display_footer)
-					$this->initFooter();
-			
-				// default behavior for ajax process is to use $_POST[action] or $_GET[action]
-				// then using displayAjax[action]
-				if ($this->ajax)
-				{
-					$action = Tools::getValue('action');
-					if (!empty($action) && method_exists($this, 'displayAjax'.Tools::toCamelCase($action)))
-						$this->{'displayAjax'.$action}();
-					elseif (method_exists($this, 'displayAjax'))
-						$this->displayAjax();
-				}
+			// default behavior for ajax process is to use $_POST[action] or $_GET[action]
+			// then using displayAjax[action]
+			if ($this->ajax)
+			{
+				$action = Tools::getValue('action');
+				if (!empty($action) && method_exists($this, 'displayAjax'.Tools::toCamelCase($action)))
+					$this->{'displayAjax'.$action}();
+				elseif (method_exists($this, 'displayAjax'))
+					$this->displayAjax();
+			}
 		}
 		else
 			$this->initCursedPage();