[-] WS : Fix xlink

[*] WS : Add entity tax_rule_groups
[*] WS : Fix ObjectModel issue
[*] WS : Delete sqlId not used
[*] WS : Fix entity configurations
[*] WS : Fix entity translated_configurations


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13138 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aKorczak
2012-02-08 15:42:53 +00:00
parent f4d3ca50f1
commit de544a8be4
6 changed files with 31 additions and 7 deletions
+2 -1
View File
@@ -851,7 +851,7 @@ abstract class ObjectModelCore
$resource_parameters = array_merge_recursive($default_resource_parameters, $this->{$ws_params_attribute_name});
$required_fields = (isset(self::$fieldsRequiredDatabase[get_class($this)]) ? self::$fieldsRequiredDatabase[get_class($this)] : array());
foreach ($this->definition['fields'] as $field_name => $details)
foreach ($this->def['fields'] as $field_name => $details)
{
if (!isset($resource_parameters['fields'][$field_name]))
$resource_parameters['fields'][$field_name] = array();
@@ -910,6 +910,7 @@ abstract class ObjectModelCore
WHERE 1 '.$sql_filter.'
'.($sql_sort != '' ? $sql_sort : '').'
'.($sql_limit != '' ? $sql_limit : '');
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
}