[-] FO: Fix #PSCFV-5158

This commit is contained in:
rGaillard
2012-10-22 17:10:58 +00:00
parent fce24f4041
commit de754db5aa
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -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`
+1 -1
View File
@@ -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}