diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-15 11:18:13 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-15 11:18:13 +0100 |
| commit | 97e002cc3dc9a19b1fca10109c61b3d4e66ef201 (patch) | |
| tree | cb87b284a5a4728ee59817065990e2989ddfcd7b /phpBB | |
| parent | 254291b644c38a15f2b5ecf4babcbb0be5097828 (diff) | |
| parent | 295a424fc72a4e810d89a183f43cba3c2a6fee76 (diff) | |
| download | forums-97e002cc3dc9a19b1fca10109c61b3d4e66ef201.tar forums-97e002cc3dc9a19b1fca10109c61b3d4e66ef201.tar.gz forums-97e002cc3dc9a19b1fca10109c61b3d4e66ef201.tar.bz2 forums-97e002cc3dc9a19b1fca10109c61b3d4e66ef201.tar.xz forums-97e002cc3dc9a19b1fca10109c61b3d4e66ef201.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/phpbb/log/log.php
Diffstat (limited to 'phpBB')
| -rwxr-xr-x | phpBB/bin/phpbbcli.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/log/log.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php index e1f81662d2..72f1785931 100755 --- a/phpBB/bin/phpbbcli.php +++ b/phpBB/bin/phpbbcli.php @@ -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'); diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index 436c21bdad..ee002c560a 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 ? (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, ); |