makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/9886] Update fails on PostgreSQL because of an error in _add_module
This commit is contained in:
Nils Adermann 2010-11-10 16:17:40 +01:00
commit 42457719c2
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/install/database_update.php
View file

@ -694,8 +694,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);