From 589e7ba6987594aaf0b9969e695e7486d4d4e26b Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Mon, 7 May 2012 14:04:11 +0000
Subject: [PATCH] [-] BO : fix bug #PSCFV-1597 - image upload size display

---
 .../themes/default/template/controllers/products/images.tpl     | 2 +-
 controllers/admin/AdminProductsController.php                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/products/images.tpl b/admin-dev/themes/default/template/controllers/products/images.tpl
index 94926b13b..f57eb6d80 100644
--- a/admin-dev/themes/default/template/controllers/products/images.tpl
+++ b/admin-dev/themes/default/template/controllers/products/images.tpl
@@ -41,7 +41,7 @@
 				<div id="progressBarImage" class="progressBarImage"></div>
 				<div id="showCounter" style="display:none;"><span id="imageUpload">0</span><span id="imageTotal">0</span></div>
 					<p class="preference_description" style="clear: both;">
-						{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"}{l s='kB max.'}
+						{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"} {l s='kB max.'}
 					</p>
 			</td>
 		</tr>
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 7a8a09e79..4f629577e 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -3264,7 +3264,7 @@ class AdminProductsControllerCore extends AdminController
 
 			$data->assign('token', $this->token);
 			$data->assign('table', $this->table);
-			$data->assign('max_image_size', $this->max_image_size / 1000);
+			$data->assign('max_image_size', $this->max_image_size / 1024);
 
 			$data->assign('up_filename', strval(Tools::getValue('virtual_product_filename_attribute')));
 			$data->assign('currency', $this->context->currency);