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

// Another fix for multishop and webservices

Browse Source
This commit is contained in:
rGaillard committed 2012-08-09 15:27:10 +00:00
1 parent e346e42f9e
commit 3a1e31f445
1 file changed
+4 -1
Download Patch File Download Diff File Expand all files Collapse all files
classes/ObjectModel.php
+4 -1
View File
@@ -1017,7 +1017,9 @@ abstract class ObjectModelCore
$assoc = Shop::getAssoTable($this->def['table']); $assoc = Shop::getAssoTable($this->def['table']);
$class_name = WebserviceRequest::$ws_current_classname; $class_name = WebserviceRequest::$ws_current_classname;
$vars = get_class_vars($class_name); $vars = get_class_vars($class_name);
if ($assoc !== false && $assoc['type'] !== 'fk_shop') if ($assoc !== false)
{
if ($assoc['type'] !== 'fk_shop')
{ {
$multi_shop_join = ' LEFT JOIN `'._DB_PREFIX_.bqSQL($this->def['table']).'_'.bqSQL($assoc['type']).'` $multi_shop_join = ' LEFT JOIN `'._DB_PREFIX_.bqSQL($this->def['table']).'_'.bqSQL($assoc['type']).'`
AS `multi_shop_'.bqSQL($this->def['table']).'` AS `multi_shop_'.bqSQL($this->def['table']).'`
@@ -1034,6 +1036,7 @@ abstract class ObjectModelCore
$or[] = ' main.id_shop = '.(int)$id_shop.' '; $or[] = ' main.id_shop = '.(int)$id_shop.' ';
$sql_filter = ' AND ('.implode('OR', $or).') '.$sql_filter; $sql_filter = ' AND ('.implode('OR', $or).') '.$sql_filter;
} }
}
$query = ' $query = '
SELECT DISTINCT main.`'.bqSQL($this->def['primary']).'` FROM `'._DB_PREFIX_.bqSQL($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.'