From 4081c7bf8036191d99f287e4675e340b168dbea5 Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Mon, 14 Nov 2011 14:29:25 +0000
Subject: [PATCH] // fix Update the call of JavaScript and CSS files in the
 class of HelperForm and controller templates (PSFV-94)

---
 .../themes/template/helper/form/form.tpl      | 52 ++++++++++---------
 classes/HelperForm.php                        |  9 ++--
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/admin-dev/themes/template/helper/form/form.tpl b/admin-dev/themes/template/helper/form/form.tpl
index b6dd1a3e4..8de3b31d0 100644
--- a/admin-dev/themes/template/helper/form/form.tpl
+++ b/admin-dev/themes/template/helper/form/form.tpl
@@ -351,28 +351,30 @@
 </form>
 {/block}
 
-<script type="text/javascript">
-
-var iso = '{$iso}';
-var pathCSS = '{$path_css}';
-var ad = '{$ad}';
-
-$(document).ready(function(){
-
-	tinySetup();
-
-	{block name="autoload_tinyMCE"}
-		$(".autoload_rte").click(function(e){
-			tinySetup({
-				mode :"exact",
-				editor_selector :"autoload_rte",
-				elements : $(this).attr("id"),
-				theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull|cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,undo,redo",
-				theme_advanced_buttons2 : "link,unlink,anchor,image,cleanup,code,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,charmap,media,|,ltr,rtl,|,fullscreen",
-				theme_advanced_buttons3 : "",
-				theme_advanced_buttons4 : "", 
-			});
-		})
-	{/block}
-});
-</script>
+{if isset($tinymce) && $tinymce}
+	<script type="text/javascript">
+	
+	var iso = '{$iso}';
+	var pathCSS = '{$path_css}';
+	var ad = '{$ad}';
+	
+	$(document).ready(function(){
+	
+		tinySetup();
+	
+		{block name="autoload_tinyMCE"}
+			$(".autoload_rte").click(function(e){
+				tinySetup({
+					mode :"exact",
+					editor_selector :"autoload_rte",
+					elements : $(this).attr("id"),
+					theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull|cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,undo,redo",
+					theme_advanced_buttons2 : "link,unlink,anchor,image,cleanup,code,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,charmap,media,|,ltr,rtl,|,fullscreen",
+					theme_advanced_buttons3 : "",
+					theme_advanced_buttons4 : "", 
+				});
+			})
+		{/block}
+	});
+	</script>
+{/if}
diff --git a/classes/HelperForm.php b/classes/HelperForm.php
index 8f8242bb0..d0d7b9293 100644
--- a/classes/HelperForm.php
+++ b/classes/HelperForm.php
@@ -124,8 +124,9 @@ class HelperFormCore extends Helper
 							{
 								$iso = $this->context->language->iso_code;
 								$this->tpl_vars['iso'] = file_exists(_PS_ROOT_DIR_.'/js/tiny_mce/langs/'.$iso.'.js') ? $iso : 'en';
-								$this->tpl_vars['theme_path_css'] = _THEME_CSS_DIR_;
+								$this->tpl_vars['path_css'] = _THEME_CSS_DIR_;
 								$this->tpl_vars['ad'] = dirname($_SERVER['PHP_SELF']);
+								$this->tpl_vars['tinymce'] = true;
 	
 								$this->context->controller->addJS(_PS_JS_DIR_.'tiny_mce/tiny_mce.js');
 								$this->context->controller->addJS(_PS_JS_DIR_.'tinymce.inc.js');
@@ -135,7 +136,6 @@ class HelperFormCore extends Helper
 					}
 				}
 
-		$iso = $this->context->language->iso_code;
 		$this->tpl->assign(array(
 			'submit_action' => $this->submit_action,
 			'toolbar_btn' => $this->toolbar_btn,
@@ -156,10 +156,7 @@ class HelperFormCore extends Helper
 			'vat_number' => file_exists(_PS_MODULE_DIR_.'vatnumber/ajax.php'),
 			'module_dir' => _MODULE_DIR_,
 			'contains_states' => (isset($this->fields_value['id_country']) && isset($this->fields_value['id_state'])) ? Country::containsStates($this->fields_value['id_country']) : null,
-			'asso_shop' => isset($asso_shop) ? $asso_shop : null,
-			'iso' => file_exists(_PS_ROOT_DIR_.'/js/tiny_mce/langs/'.$iso.'.js') ? $iso : 'en',
-			'path_css' => _THEME_CSS_DIR_,
-			'ad' => dirname($_SERVER['PHP_SELF'])
+			'asso_shop' => isset($asso_shop) ? $asso_shop : null
 		));
 		return parent::generate();
 	}