diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2015-01-20 23:44:17 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2015-01-20 23:44:17 +0100 |
| commit | fd25d00fac21f766fc7a448aee2c9b0b0991b926 (patch) | |
| tree | a75b109ed9f9899fbb6deeb0b7408fd3bc2df515 /phpBB/phpbb | |
| parent | f8c34403445fade6dd80e7edab1d7d2b3f5b4662 (diff) | |
| parent | f6057c5eabfa33aedf4183cd1327203ed8cce280 (diff) | |
| download | forums-fd25d00fac21f766fc7a448aee2c9b0b0991b926.tar forums-fd25d00fac21f766fc7a448aee2c9b0b0991b926.tar.gz forums-fd25d00fac21f766fc7a448aee2c9b0b0991b926.tar.bz2 forums-fd25d00fac21f766fc7a448aee2c9b0b0991b926.tar.xz forums-fd25d00fac21f766fc7a448aee2c9b0b0991b926.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13530] Fix undefined variables
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php index c2a3ce5940..9f6e3efb91 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php @@ -112,7 +112,7 @@ class release_3_0_5_rc1 extends container_aware_migration // Select auth_option_ids... the largest id will be preserved $sql = 'SELECT auth_option_id FROM ' . ACL_OPTIONS_TABLE . " - WHERE auth_option = '" . $db->sql_escape($option) . "' + WHERE auth_option = '" . $this->db->sql_escape($option) . "' ORDER BY auth_option_id DESC"; // sql_query_limit not possible here, due to bug in postgresql layer $result = $this->db->sql_query($sql); |