From 47c5656dd6445a5e1cae78cdce32dc1f05dc6be9 Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Wed, 14 Dec 2011 14:37:28 +0000
Subject: [PATCH] // fix bug tag image in AdminProductsController

---
 .../themes/template/products/informations.tpl | 21 ++++++++++---------
 controllers/front/ProductController.php       |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/admin-dev/themes/template/products/informations.tpl b/admin-dev/themes/template/products/informations.tpl
index c99215924..99f2af7d2 100644
--- a/admin-dev/themes/template/products/informations.tpl
+++ b/admin-dev/themes/template/products/informations.tpl
@@ -484,20 +484,20 @@ var textFieldLabel = 0;
 					<script type="text/javascript">
 						$(function() {
 							changeTagImage();
-							$("#createImageDescription input").change(function(){
+							$('#createImageDescription input').change(function(){
 								changeTagImage();
 							});
 
 							var i = 0;
-							$(".addImageDescription").click(function(){
+							$('.addImageDescription').click(function(){
 								if (i == 0){
-									$("#createImageDescription").animate({
-										opacity: 1, height: "toggle"
+									$('#createImageDescription').animate({
+										opacity: 1, height: 'toggle'
 										}, 500);
 									i = 1;
 								}else{
-									$("#createImageDescription").animate({
-										opacity: 0, height: "toggle"
+									$('#createImageDescription').animate({
+										opacity: 0, height: 'toggle'
 										}, 500);
 									i = 0;
 								}
@@ -505,10 +505,11 @@ var textFieldLabel = 0;
 						});
 
 						function changeTagImage(){
-							var smallImage = $("input[name=smallImage]:checked").attr("value");
-							var leftRight = $("input[name=leftRight]:checked").attr("value");
-							var imageTypes = $("input[name=imageTypes]:checked").attr("value");
-							$("#resultImage").val("{img-"+smallImage+"-"+leftRight+"-"+imageTypes+"}");
+							var smallImage = $('input[name=smallImage]:checked').attr('value');
+							var leftRight = $('input[name=leftRight]:checked').attr('value');
+							var imageTypes = $('input[name=imageTypes]:checked').attr('value');
+							var tag = '[img-'+smallImage+'-'+leftRight+'-'+imageTypes+']';
+							$('#resultImage').val(tag);
 						}
 					</script>
 {/if}
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index 45c2fb863..f84afbd4d 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -440,7 +440,7 @@ class ProductControllerCore extends FrontController
 
 	public function transformDescriptionWithImg($desc)
 	{
-		$reg = '/{img-([0-9]+)-(left|right)-([a-z]+)}/';
+		$reg = '/\[img-([0-9]+)-(left|right)-([a-z]+)\]/';
 		while (preg_match($reg, $desc, $matches))
 		{
 			$link_lmg = $this->context->link->getImageLink($this->product->link_rewrite, $this->product->id.'-'.$matches[1], $matches[3]);