Merge branch 'ticket/nickvergessen/9886' into develop-olympus

* ticket/nickvergessen/9886:
  [ticket/9886] Update fails on PostgreSQL because of an error in _add_module
This commit is contained in:
Nils Adermann 2010-11-10 16:16:16 +01:00
commit 2ed9b3e1d5

View file

@ -685,8 +685,7 @@ function _add_modules($modules_to_install)
FROM ' . MODULES_TABLE . " FROM ' . MODULES_TABLE . "
WHERE module_class = '" . $db->sql_escape($module_data['class']) . "' WHERE module_class = '" . $db->sql_escape($module_data['class']) . "'
AND parent_id = {$parent_id} AND parent_id = {$parent_id}
AND left_id BETWEEN {$first_left_id} AND {$module_row['left_id']} AND left_id BETWEEN {$first_left_id} AND {$module_row['left_id']}";
ORDER BY left_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$steps = (int) $db->sql_fetchfield('num_modules'); $steps = (int) $db->sql_fetchfield('num_modules');
$db->sql_freeresult($result); $db->sql_freeresult($result);