diff options
| author |   Andreas Fischer <bantu@phpbb.com> | 2014-03-28 21:48:29 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-03-28 22:14:53 +0100 |
| commit | 043b6a207a563e135296550270bd296292926f3d (patch) | |
| tree | 3d8a15c088b5ed1127f75023c8af6c0346a5928d /tests/notification | |
| parent | Merge remote-tracking branch 'vsephpbb/ticket/12315' into develop-ascraeus (diff) | |
| download | phpbb-043b6a207a563e135296550270bd296292926f3d.tar.gz phpbb-043b6a207a563e135296550270bd296292926f3d.tar.bz2 phpbb-043b6a207a563e135296550270bd296292926f3d.zip | |
[ticket/12317] Do not repeat SQL query in notification_submit_post_base.
PHPBB3-12317
Diffstat (limited to 'tests/notification')
| -rw-r--r-- | tests/notification/submit_post_base.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index fb8e2ac807..10d676c687 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -133,7 +133,7 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATION_TYPES_TABLE . " nt WHERE nt.notification_type_name = '" . $this->item_type . "' AND n.notification_type_id = nt.notification_type_id - ORDER BY user_id, item_id ASC"; + ORDER BY user_id ASC, item_id ASC"; $result = $this->db->sql_query($sql); $this->assertEquals($expected_before, $this->db->sql_fetchrowset($result)); $this->db->sql_freeresult($result); @@ -142,11 +142,6 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c $post_data = array_merge($this->post_data, $additional_post_data); submit_post('reply', '', 'poster-name', POST_NORMAL, $poll_data, $post_data, false, false); - $sql = 'SELECT user_id, item_id, item_parent_id - FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATION_TYPES_TABLE . " nt - WHERE nt.notification_type_name = '" . $this->item_type . "' - AND n.notification_type_id = nt.notification_type_id - ORDER BY user_id ASC, item_id ASC"; $result = $this->db->sql_query($sql); $this->assertEquals($expected_after, $this->db->sql_fetchrowset($result)); $this->db->sql_freeresult($result); |