diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-15 11:15:56 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-15 11:15:56 +0100 |
| commit | 295a424fc72a4e810d89a183f43cba3c2a6fee76 (patch) | |
| tree | 67f13dd48a6e34be045d2b52bcc976b87cb620b5 | |
| parent | f979d2c7b2f93bc734ae7b87debb4457f62ea24c (diff) | |
| parent | d045822cd8cc2220a2ad3e159e3b688cb4049c12 (diff) | |
| download | forums-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
| -rwxr-xr-x | phpBB/bin/phpbbcli.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/log/log.php | 4 | ||||
| -rw-r--r-- | tests/log/add_test.php | 9 |
3 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php index ca425ad0c4..239dd3932b 100755 --- a/phpBB/bin/phpbbcli.php +++ b/phpBB/bin/phpbbcli.php @@ -59,6 +59,8 @@ $phpbb_container->get('request')->enable_super_globals(); require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx); $user = $phpbb_container->get('user'); +$user->data['user_id'] = ANONYMOUS; +$user->ip = '127.0.0.1'; $user->add_lang('acp/common'); $user->add_lang('cli'); 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'); } } |