mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +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

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,
);