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

[-] WS: Norm fix

Browse Source
This commit is contained in:
aKorczak
2011-12-20 14:38:18 +00:00
parent b3ac2dbe88
commit b1ffa0b466
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/ObjectModel.php
+4 -5
View File
@@ -925,22 +925,21 @@ abstract class ObjectModelCore
if (array_key_exists($this->def['table'] ,$assoc)) if (array_key_exists($this->def['table'] ,$assoc))
{ {
$multi_shop_join = ' LEFT JOIN `'._DB_PREFIX_.$this->def['table'].'_'.$assoc[$this->def['table']]['type'].'` AS multi_shop_'.$this->def['table'].' ON (main.'.$this->def['primary'].' = '.'multi_shop_'.$this->def['table'].'.'.$this->def['primary'].')'; $multi_shop_join = ' LEFT JOIN `'._DB_PREFIX_.bqSQL($this->def['table']).'_'.bqSQL($assoc[$this->def['table']]['type']).'` AS multi_shop_'.bqSQL($this->def['table']).' ON (main.'.bqSQL($this->def['primary']).' = '.'multi_shop_'.bqSQL($this->def['table']).'.'.bqSQL($this->def['primary']).')';
$class_name = WebserviceRequest::$ws_current_classname; $class_name = WebserviceRequest::$ws_current_classname;
$vars = get_class_vars($class_name); $vars = get_class_vars($class_name);
foreach ($vars['shopIDs'] as $id_shop) foreach ($vars['shopIDs'] as $id_shop)
$OR[] = ' multi_shop_'.$this->def['table'].'.id_shop = '.$id_shop.' '; $OR[] = ' multi_shop_'.bqSQL($this->def['table']).'.id_shop = '.(int)$id_shop.' ';
$multi_shop_filter = ' AND ('.implode('OR', $OR).') '; $multi_shop_filter = ' AND ('.implode('OR', $OR).') ';
$sql_filter = $multi_shop_filter.' '.$sql_filter; $sql_filter = $multi_shop_filter.' '.$sql_filter;
$sql_join = $multi_shop_join .' '. $sql_join; $sql_join = $multi_shop_join .' '. $sql_join;
} }
$query = ' $query = '
SELECT DISTINCT main.`'.$this->def['primary'].'` FROM `'._DB_PREFIX_.$this->def['table'].'` AS main SELECT DISTINCT main.`'.bqSQL($this->def['primary']).'` FROM `'._DB_PREFIX_.bqSQL($this->def['table']).'` AS main
'.$sql_join.' '.$sql_join.'
WHERE 1 '.$sql_filter.' WHERE 1 '.$sql_filter.'
'.($sql_sort != '' ? $sql_sort : '').' '.($sql_sort != '' ? $sql_sort : '').'
'.($sql_limit != '' ? $sql_limit : '').' '.($sql_limit != '' ? $sql_limit : '');
';
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
} }