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

[-] FO: Fix random bugs with metas

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17264 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-09-10 09:42:27 +00:00
parent 7515e9e6cc
commit e55e96950b
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Meta.php
+7 -9
View File
@@ -127,7 +127,7 @@ class MetaCore extends ObjectModel
$sql = 'SELECT * $sql = 'SELECT *
FROM '._DB_PREFIX_.'meta m FROM '._DB_PREFIX_.'meta m
LEFT JOIN '._DB_PREFIX_.'meta_lang ml on (m.id_meta = ml.id_meta) LEFT JOIN '._DB_PREFIX_.'meta_lang ml on (m.id_meta = ml.id_meta)
WHERE m.page = \''.pSQL($page).'\' WHERE (m.page = \''.pSQL($page).'\' OR m.page=\''.str_replace('-', '', strtolower($page)).'\')
AND ml.id_lang = '.(int)$id_lang AND ml.id_lang = '.(int)$id_lang
.Shop::addSqlRestrictionOnLang('ml'); .Shop::addSqlRestrictionOnLang('ml');
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql); return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql);
@@ -184,21 +184,19 @@ class MetaCore extends ObjectModel
public static function getMetaTags($id_lang, $page_name, $title = '') public static function getMetaTags($id_lang, $page_name, $title = '')
{ {
global $maintenance; global $maintenance;
$page_name = str_replace('-', '', strtolower($page_name));
if (!(isset($maintenance) && (!in_array(Tools::getRemoteAddr(), explode(',', Configuration::get('PS_MAINTENANCE_IP')))))) if (!(isset($maintenance) && (!in_array(Tools::getRemoteAddr(), explode(',', Configuration::get('PS_MAINTENANCE_IP'))))))
{ {
if ($id_product = Tools::getValue('id_product')) if ($page_name == 'product' && ($id_product = Tools::getValue('id_product')))
return Meta::getProductMetas($id_product, $id_lang, $page_name); return Meta::getProductMetas($id_product, $id_lang, $page_name);
else if ($id_category = Tools::getValue('id_category')) elseif ($page_name == 'category' && ($id_category = Tools::getValue('id_category')))
return Meta::getCategoryMetas($id_category, $id_lang, $page_name, $title); return Meta::getCategoryMetas($id_category, $id_lang, $page_name, $title);
else if ($id_manufacturer = Tools::getValue('id_manufacturer')) elseif ($page_name == 'manufacturer' && ($id_manufacturer = Tools::getValue('id_manufacturer')))
return Meta::getManufacturerMetas($id_manufacturer, $id_lang, $page_name); return Meta::getManufacturerMetas($id_manufacturer, $id_lang, $page_name);
else if ($id_supplier = Tools::getValue('id_supplier')) elseif ($page_name == 'supplier' && ($id_supplier = Tools::getValue('id_supplier')))
return Meta::getSupplierMetas($id_supplier, $id_lang, $page_name); return Meta::getSupplierMetas($id_supplier, $id_lang, $page_name);
else if ($id_cms = Tools::getValue('id_cms')) elseif ($page_name == 'cms' && ($id_cms = Tools::getValue('id_cms')))
return Meta::getCmsMetas($id_cms, $id_lang, $page_name); return Meta::getCmsMetas($id_cms, $id_lang, $page_name);
else if ($id_cms_category = Tools::getValue('id_cms_category')) elseif ($page_name == 'cms' && ($id_cms_category = Tools::getValue('id_cms_category')))
return Meta::getCmsCategoryMetas($id_cms_category, $id_lang, $page_name); return Meta::getCmsCategoryMetas($id_cms_category, $id_lang, $page_name);
} }