mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	phpBB/phpbb/log/log.php
This commit is contained in:
Marc Alexander
2016-01-15 11:18:13 +01:00
parent 254291b644 295a424fc7
commit 97e002cc3d
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/log/add_test.php
View File

@@ -92,5 +92,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');
}
}