diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-11-10 16:16:16 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-11-10 16:16:16 +0100 |
| commit | 2ed9b3e1d50ff4dc15b0cc9221b333a743923ffe (patch) | |
| tree | 6ca847c358848a50a1a6df9ebefbbd4f54d6270a /phpBB | |
| parent | 1b12884c7d9776ace7255e0ee1e3b6e274bc9fb3 (diff) | |
| parent | d722eeb64b0a8906ae62e814156de3582c16b820 (diff) | |
| download | forums-2ed9b3e1d50ff4dc15b0cc9221b333a743923ffe.tar forums-2ed9b3e1d50ff4dc15b0cc9221b333a743923ffe.tar.gz forums-2ed9b3e1d50ff4dc15b0cc9221b333a743923ffe.tar.bz2 forums-2ed9b3e1d50ff4dc15b0cc9221b333a743923ffe.tar.xz forums-2ed9b3e1d50ff4dc15b0cc9221b333a743923ffe.zip | |
Merge branch 'ticket/nickvergessen/9886' into develop-olympus
* ticket/nickvergessen/9886:
[ticket/9886] Update fails on PostgreSQL because of an error in _add_module
Diffstat (limited to 'phpBB')
| -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 8d67d2353d..95f7cdae87 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -685,8 +685,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); |