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 | |
| 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
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php | 2 | ||||
| -rw-r--r-- | tests/functional/prune_shadow_topic_test.php | 2 |
2 files changed, 2 insertions, 2 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); diff --git a/tests/functional/prune_shadow_topic_test.php b/tests/functional/prune_shadow_topic_test.php index f00303060d..c014119b98 100644 --- a/tests/functional/prune_shadow_topic_test.php +++ b/tests/functional/prune_shadow_topic_test.php @@ -62,7 +62,7 @@ class phpbb_functional_prune_shadow_topic_test extends phpbb_functional_test_cas $crawler = self::request('GET', "viewtopic.php?t={$this->post['topic_id']}&sid={$this->sid}"); $this->assertContains('Prune Shadow #1', $crawler->filter('html')->text()); - $this->data['topics']['Prune Shadow #1'] = (int) $post['topic_id']; + $this->data['topics']['Prune Shadow #1'] = (int) $this->post['topic_id']; $this->data['posts']['Prune Shadow #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p'); $this->assert_forum_details($this->data['forums']['Prune Shadow'], array( |