From de754db5aaf2095af712cff305120d475c8208cc Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Mon, 22 Oct 2012 17:10:58 +0000
Subject: [PATCH] [-] FO: Fix #PSCFV-5158

---
 classes/Manufacturer.php             | 2 +-
 themes/default/manufacturer-list.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Manufacturer.php b/classes/Manufacturer.php
index 2735a1182..1794508be 100644
--- a/classes/Manufacturer.php
+++ b/classes/Manufacturer.php
@@ -162,7 +162,7 @@ class ManufacturerCore extends ObjectModel
 		if (!$id_lang)
 			$id_lang = (int)Configuration::get('PS_LANG_DEFAULT');
 
-		$sql = 'SELECT m.*, ml.`description`
+		$sql = 'SELECT m.*, ml.`description`, ml.`short_description`
 			FROM `'._DB_PREFIX_.'manufacturer` m
 			LEFT JOIN `'._DB_PREFIX_.'manufacturer_lang` ml ON (
 				m.`id_manufacturer` = ml.`id_manufacturer`
diff --git a/themes/default/manufacturer-list.tpl b/themes/default/manufacturer-list.tpl
index ec388b500..8fd6d7b42 100644
--- a/themes/default/manufacturer-list.tpl
+++ b/themes/default/manufacturer-list.tpl
@@ -64,7 +64,7 @@
 					</h3>
 					<p class="description rte">
 					{if $manufacturer.nb_products > 0}<a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'htmlall':'UTF-8'}">{/if}
-						{$manufacturer.description}
+						{$manufacturer.short_description}
 					{if $manufacturer.nb_products > 0}</a>{/if}
 					<br />
 					{if $manufacturer.nb_products > 0}<a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'htmlall':'UTF-8'}">{/if}