mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-19 23:32:02 +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
commit 97e002cc3d
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/bin/phpbbcli.php
View File

@ -70,6 +70,8 @@ require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
/* @var $user \phpbb\user */
$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');

4
phpBB/phpbb/log/log.php
View File

@ -229,8 +229,8 @@ class log implements \phpbb\log\log_interface
}
$sql_ary = array(
'user_id' => $user_id ? (int) $user_id : ANONYMOUS,
'log_ip' => empty($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,
);

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');
}
}