[-] CORE : Fix bug #PSCSX-1258, js stack repeated for 1.4 template

PrestaShop · Mar 25, 2014 · 4827057 · 4827057
1 parent 950f3d8
commit 4827057
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php
@@ -403,7 +403,7 @@ protected function smartyOutputContent($content)
 
 		$html = trim($html);
 
-		if ($this->controller_type == 'front' && !empty($html))
+		if ($this->controller_type == 'front' && !empty($html) && $this->getLayout())
 		{
  			$dom_available = extension_loaded('dom') ? true : false;
  			if ($dom_available)

diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
@@ -480,7 +480,7 @@ public function displayHeader($display = true)
 
 		$this->context->smarty->assign(array(
 			'css_files' => $this->css_files,
-			'js_files' => array() // assign moved to smartyOutputContent since 1.6
+			'js_files' => $this->getLayout() ? array() : $this->js_files
 		));
 
 		$this->display_header = $display;
@@ -535,7 +535,7 @@ public function display()
 
 		$this->context->smarty->assign(array(
 			'css_files' => $this->css_files,
-			'js_files' => array(), // assign moved to smartyOutputContent since 1.6
+			'js_files' => $this->getLayout() ? array() : $this->js_files,
 			'errors' => $this->errors,
 			'display_header' => $this->display_header,
 			'display_footer' => $this->display_footer,