// Fix #PSCFV-4468

classes/Cookie.php

@@ -318,8 +318,7 @@ class CookieCore
 
 	public function __destruct()
 	{
-		if ($this->_modified)
+		$this->write();
-			$this->write();
 	}
 
 	/**
@@ -327,6 +326,9 @@ class CookieCore
 	 */
 	public function write()
 	{
+		if (!$this->_modified || headers_sent())
+			return;
+
 		$cookie = '';
 
 		/* Serialize cookie content */
@@ -336,7 +338,7 @@ class CookieCore
 
 		/* Add checksum to cookie */
 		$cookie .= 'checksum|'.crc32($this->_iv.$cookie);
-
+		$this->_modified = false;
 		/* Cookies are encrypted for evident security reasons */
 		return $this->_setcookie($cookie);
 	}

classes/controller/AdminController.php

@@ -1160,10 +1160,10 @@ class AdminControllerCore extends Controller
 			$this->context->smarty->assign('page', Tools::jsonEncode($page));
 		else
 			$this->context->smarty->assign('page', $page);
-
+		$this->smartyOutputContent($this->layout);
-		$this->context->smarty->display($this->layout);
 	}
 
+
 	/**
 	 * add a warning message to display at the top of the page
 	 *

classes/controller/Controller.php

@@ -347,4 +347,10 @@ abstract class ControllerCore
 	{
 		return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
 	}
+	
+	protected function smartyOutputContent($content)
+	{
+		$this->context->cookie->write();
+		$this->context->smarty->display($content);
+	}
 }

classes/controller/FrontController.php

@@ -497,7 +497,7 @@ class FrontControllerCore extends Controller
 		$this->context->smarty->assign('js_files', array_unique($this->js_files));
 
 		$this->display_header = $display;
-		$this->context->smarty->display(_PS_THEME_DIR_.'header.tpl');
+		$this->smartyOutputContent(_PS_THEME_DIR_.'header.tpl');
 
 	}
 
@@ -508,7 +508,7 @@ class FrontControllerCore extends Controller
 	{
 		// This method will be removed in 1.6
 		Tools::displayAsDeprecated();
-		$this->context->smarty->display(_PS_THEME_DIR_.'footer.tpl');
+		$this->smartyOutputContent(_PS_THEME_DIR_.'footer.tpl');
 	}
 
 	public function initCursedPage()
@@ -572,28 +572,28 @@ class FrontControllerCore extends Controller
 				ob_clean();
 				$this->context->smarty->assign('template', $template);
 			}
-			$this->context->smarty->display($layout);
+			$this->smartyOutputContent($layout);
 		}
 		else
 		{
 			// BEGIN - 1.4 retrocompatibility - will be removed in 1.6
 			Tools::displayAsDeprecated('layout.tpl is missing in your theme directory');
 			if ($this->display_header)
-				$this->context->smarty->display(_PS_THEME_DIR_.'header.tpl');
+				$this->smartyOutputContent(_PS_THEME_DIR_.'header.tpl');
 
 			if ($this->template)
-				$this->context->smarty->display($this->template);
+				$this->smartyOutputContent($this->template);
 			else // For retrocompatibility with 1.4 controller
 				$this->displayContent();
 
 			if ($this->display_footer)
-				$this->context->smarty->display(_PS_THEME_DIR_.'footer.tpl');
+				$this->smartyOutputContent(_PS_THEME_DIR_.'footer.tpl');
 
 			// live edit
 			if (Tools::isSubmit('live_edit') && ($ad = Tools::getValue('ad')) && Tools::getAdminToken('AdminModulesPositions'.(int)Tab::getIdFromClassName('AdminModulesPositions').(int)Tools::getValue('id_employee')))
 			{
 				$this->context->smarty->assign(array('ad' => $ad, 'live_edit' => true));
-				$this->context->smarty->display(_PS_ALL_THEMES_DIR_.'live_edit.tpl');
+				$this->smartyOutputContent(_PS_ALL_THEMES_DIR_.'live_edit.tpl');
 			}
 			// END - 1.4 retrocompatibility - will be removed in 1.6
 		}
@@ -613,7 +613,7 @@ class FrontControllerCore extends Controller
 				$this->context->smarty->assign('favicon_url', _PS_IMG_.Configuration::get('PS_FAVICON'));
 
 				$template_dir = ($this->context->getMobileDevice() == true ? _PS_THEME_MOBILE_DIR_ : _PS_THEME_DIR_);
-				$this->context->smarty->display($template_dir.'maintenance.tpl');
+				$this->smartyOutputContent($template_dir.'maintenance.tpl');
 				exit;
 			}
 		}
@@ -624,7 +624,7 @@ class FrontControllerCore extends Controller
 	{
 		header('HTTP/1.1 503 temporarily overloaded');
 		$this->context->smarty->assign('favicon_url', _PS_IMG_.Configuration::get('PS_FAVICON'));
-		$this->context->smarty->display(_PS_THEME_DIR_.'restricted-country.tpl');
+		$this->smartyOutputContent(_PS_THEME_DIR_.'restricted-country.tpl');
 		exit;
 	}
 

controllers/admin/AdminCartsController.php

@@ -295,7 +295,7 @@ class AdminCartsControllerCore extends AdminController
 			$this->initFooter();
 			$this->context->smarty->assign(array('customization_errors' => implode('<br />', $errors),
 															'css_files' => $this->css_files));
-			return $this->context->smarty->display('controllers/orders/form_customization_feedback.tpl');
+			return $this->smartyOutputContent('controllers/orders/form_customization_feedback.tpl');
 		}
 	}
 	

controllers/admin/AdminModulesController.php

@@ -222,7 +222,7 @@ class AdminModulesControllerCore extends AdminController
 			Configuration::updateValue('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee, '');
 
 		$this->initContent();
-		$this->context->smarty->display('controllers/modules/list.tpl');
+		$this->smartyOutputContent('controllers/modules/list.tpl');
 		exit;
 	}
 

controllers/front/OrderReturnController.php

@@ -89,7 +89,7 @@ class OrderReturnControllerCore extends FrontController
 
 	public function displayAjax()
 	{
-		$this->context->smarty->display($this->template);
+		$this->smartyOutputContent($this->template);
 	}
 }