diff options
author | Oliver Schramm <oliver.schramm97@gmail.com> | 2016-01-10 17:43:10 +0100 |
---|---|---|
committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2016-01-10 17:43:10 +0100 |
commit | 0cc41b94b1715ed6ae0175f77403410552f671af (patch) | |
tree | e1dac35c9bbb4cf4577b1d262c5af9c292f31d7c | |
parent | d64680983a5fa06a737a1ae7e164cb7f67a5a53c (diff) | |
download | forums-0cc41b94b1715ed6ae0175f77403410552f671af.tar forums-0cc41b94b1715ed6ae0175f77403410552f671af.tar.gz forums-0cc41b94b1715ed6ae0175f77403410552f671af.tar.bz2 forums-0cc41b94b1715ed6ae0175f77403410552f671af.tar.xz forums-0cc41b94b1715ed6ae0175f77403410552f671af.zip |
[ticket/14403] Don't expect user_id and user_ip in phpbb\log
PHPBB3-14403
-rw-r--r-- | phpBB/phpbb/log/log.php | 4 | ||||
-rw-r--r-- | tests/log/add_test.php | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index 3d995b4e4a..d46e3d1f3f 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -229,8 +229,8 @@ class log implements \phpbb\log\log_interface } $sql_ary = array( - 'user_id' => $user_id, - 'log_ip' => $log_ip, + 'user_id' => !empty($user_id) ? $user_id : ANONYMOUS, + 'log_ip' => !empty($log_ip) ? $log_ip : '', 'log_time' => $log_time, 'log_operation' => $log_operation, ); 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'); } } |