1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch 'ticket/13930' into ticket/13930-master

Conflicts:
	phpBB/includes/acp/acp_database.php
This commit is contained in:
Marc Alexander
2015-06-08 15:39:47 +02:00
9 changed files with 76 additions and 13 deletions

View File

@@ -535,7 +535,7 @@ class log implements \phpbb\log\log_interface
'ORDER_BY' => $sort_by,
);
if($log_time)
if ($log_time)
{
$get_logs_sql_ary['WHERE'] = 'l.log_time >= ' . (int) $log_time . '
AND ' . $get_logs_sql_ary['WHERE'];