diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-11-10 16:17:40 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-11-10 16:17:40 +0100 |
| commit | 42457719c20d452fa84d262d93e00e0060399b6c (patch) | |
| tree | 81dee577a5a1f92d0029ed199338213ce0df1240 | |
| parent | f977075b43abf5a326d48cafaedee26181ae7d8c (diff) | |
| parent | 2ed9b3e1d50ff4dc15b0cc9221b333a743923ffe (diff) | |
| download | forums-42457719c20d452fa84d262d93e00e0060399b6c.tar forums-42457719c20d452fa84d262d93e00e0060399b6c.tar.gz forums-42457719c20d452fa84d262d93e00e0060399b6c.tar.bz2 forums-42457719c20d452fa84d262d93e00e0060399b6c.tar.xz forums-42457719c20d452fa84d262d93e00e0060399b6c.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9886] Update fails on PostgreSQL because of an error in _add_module
| -rw-r--r-- | phpBB/install/database_update.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index c93976a8cf..91ecc6d302 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -694,8 +694,7 @@ function _add_modules($modules_to_install) FROM ' . MODULES_TABLE . " WHERE module_class = '" . $db->sql_escape($module_data['class']) . "' AND parent_id = {$parent_id} - AND left_id BETWEEN {$first_left_id} AND {$module_row['left_id']} - ORDER BY left_id"; + AND left_id BETWEEN {$first_left_id} AND {$module_row['left_id']}"; $result = $db->sql_query($sql); $steps = (int) $db->sql_fetchfield('num_modules'); $db->sql_freeresult($result); |