diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2015-01-20 23:43:57 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2015-01-20 23:43:57 +0100 |
| commit | f6057c5eabfa33aedf4183cd1327203ed8cce280 (patch) | |
| tree | d2fa0684669a2a0533afe9ed60c0e393315b2c5e | |
| parent | 9334100cb3f9ee2ecf614308ddf8502c62a243ac (diff) | |
| parent | ed6b8f84ad07a8aaa88124bb29e26f9042c3f552 (diff) | |
| download | forums-f6057c5eabfa33aedf4183cd1327203ed8cce280.tar forums-f6057c5eabfa33aedf4183cd1327203ed8cce280.tar.gz forums-f6057c5eabfa33aedf4183cd1327203ed8cce280.tar.bz2 forums-f6057c5eabfa33aedf4183cd1327203ed8cce280.tar.xz forums-f6057c5eabfa33aedf4183cd1327203ed8cce280.zip | |
Merge pull request #3315 from nickvergessen/ticket/13530
[ticket/13530] Fix undefined variables
* nickvergessen/ticket/13530:
[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 c3e887841f..003ccf8f18 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 @@ -110,7 +110,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( |