aboutsummaryrefslogtreecommitdiffstats
path: root/tests/log
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-01-15 11:15:56 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-01-15 11:15:56 +0100
commit295a424fc72a4e810d89a183f43cba3c2a6fee76 (patch)
tree67f13dd48a6e34be045d2b52bcc976b87cb620b5 /tests/log
parentf979d2c7b2f93bc734ae7b87debb4457f62ea24c (diff)
parentd045822cd8cc2220a2ad3e159e3b688cb4049c12 (diff)
downloadforums-295a424fc72a4e810d89a183f43cba3c2a6fee76.tar
forums-295a424fc72a4e810d89a183f43cba3c2a6fee76.tar.gz
forums-295a424fc72a4e810d89a183f43cba3c2a6fee76.tar.bz2
forums-295a424fc72a4e810d89a183f43cba3c2a6fee76.tar.xz
forums-295a424fc72a4e810d89a183f43cba3c2a6fee76.zip
Merge pull request #4117 from Elsensee/ticket/14403
[ticket/14403] Don't expect user_id and user_ip in phpbb\log
Diffstat (limited to 'tests/log')
-rw-r--r--tests/log/add_test.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/log/add_test.php b/tests/log/add_test.php
index bacc0c76f7..29d3adaeb6 100644
--- a/tests/log/add_test.php
+++ b/tests/log/add_test.php
@@ -88,5 +88,14 @@ class phpbb_log_add_test extends phpbb_database_test_case
// Invalid mode specified
$this->assertFalse($log->add('mode_does_not_exist', $user_id, $log_ip, $log_operation, $log_time));
+
+ // null user and null ip given
+ $this->assertEquals(3, $log->add($mode, null, null, $log_operation, $log_time), 'Adding log with null user_id and null user_ip failed');
+ $sql = 'SELECT user_id, log_ip FROM ' . LOG_TABLE . ' WHERE log_id = 3';
+ $result = $db->sql_query($sql);
+ $row = $db->sql_fetchrow($result);
+ $db->sql_freeresult($result);
+ $this->assertEquals(ANONYMOUS, $row['user_id'], 'Adding log with null user_id failed');
+ $this->assertEquals('', $row['log_ip'], 'Adding log with null user_ip failed');
}
}