aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-01-20 23:36:45 +0100
committerJoas Schilling <nickvergessen@gmx.de>2015-01-20 23:36:45 +0100
commited6b8f84ad07a8aaa88124bb29e26f9042c3f552 (patch)
treea84d86f21926c60724813f1a376e6bb26701e9c3
parenta5fae1b1f09358f8a24ff32fc5192395cd314244 (diff)
downloadforums-ed6b8f84ad07a8aaa88124bb29e26f9042c3f552.tar
forums-ed6b8f84ad07a8aaa88124bb29e26f9042c3f552.tar.gz
forums-ed6b8f84ad07a8aaa88124bb29e26f9042c3f552.tar.bz2
forums-ed6b8f84ad07a8aaa88124bb29e26f9042c3f552.tar.xz
forums-ed6b8f84ad07a8aaa88124bb29e26f9042c3f552.zip
[ticket/13530] Fix undefined variables
PHPBB3-13530
-rw-r--r--phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php2
-rw-r--r--tests/functional/prune_shadow_topic_test.php2
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(