dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// norms

Browse Source
This commit is contained in:
gRoussac
2013-05-27 18:13:13 +02:00
committed by Francois Gaillard
parent f591249248
commit 94f7b2fa3c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockcms/BlockCMSModel.php
+2 -2
View File
@@ -335,7 +335,7 @@ class BlockCMSModel extends ObjectModel
ON (bc.`id_cms_category` = ccl.`id_cms_category`) ON (bc.`id_cms_category` = ccl.`id_cms_category`)
INNER JOIN `'._DB_PREFIX_.'cms_block_lang` bcl INNER JOIN `'._DB_PREFIX_.'cms_block_lang` bcl
ON (bc.`id_cms_block` = bcl.`id_cms_block`) ON (bc.`id_cms_block` = bcl.`id_cms_block`)
WHERE bc.`location` = '.(int)($location).' WHERE bc.`location` = '.(int)$location.'
AND ccl.`id_lang` = '.(int)$context->language->id.' AND ccl.`id_lang` = '.(int)$context->language->id.'
AND bcl.`id_lang` = '.(int)$context->language->id.' AND bcl.`id_lang` = '.(int)$context->language->id.'
AND bcs.id_shop = '.($id_shop ? (int)$id_shop : (int)$context->shop->id).' AND bcs.id_shop = '.($id_shop ? (int)$id_shop : (int)$context->shop->id).'
@@ -540,7 +540,7 @@ class BlockCMSModel extends ObjectModel
{ {
foreach ($content[$key]['cms'] as $row) foreach ($content[$key]['cms'] as $row)
{ {
$row['link'] = $context->link->getCMSLink((int)($row['id_cms']), $row['link_rewrite']); $row['link'] = $context->link->getCMSLink((int)$row['id_cms'], $row['link_rewrite']);
$links[] = $row; $links[] = $row;
} }
} }