aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_logs.php10
-rw-r--r--phpBB/includes/mcp/mcp_logs.php4
2 files changed, 2 insertions, 12 deletions
diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php
index 6b7ed1d269..80dee1d620 100644
--- a/phpBB/includes/acp/acp_logs.php
+++ b/phpBB/includes/acp/acp_logs.php
@@ -58,13 +58,7 @@ class acp_logs
if ($deletemark && sizeof($marked))
{
- $sql_in = array();
- foreach ($marked as $mark)
- {
- $sql_in[] = $mark;
- }
- $conditions['log_id'] = $sql_in;
- unset($sql_in);
+ $conditions['log_id'] = array('IN' => $marked);
}
if ($deleteall)
@@ -78,8 +72,6 @@ class acp_logs
$conditions['keywords'] = $keywords;
}
- $conditions['log_type'] = $this->log_type;
-
$phpbb_log = $phpbb_container->get('log');
$phpbb_log->delete($mode, $conditions);
}
diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php
index a0c1bc02ec..2945e1ec8a 100644
--- a/phpBB/includes/mcp/mcp_logs.php
+++ b/phpBB/includes/mcp/mcp_logs.php
@@ -115,9 +115,8 @@ class mcp_logs
if ($deletemark && sizeof($marked))
{
$conditions = array(
- 'log_type' => LOG_MOD,
'forum_id' => $forum_list,
- 'log_id' => $marked,
+ 'log_id' => array('IN' => $marked),
);
$phpbb_log->delete('mod', $conditions);
@@ -127,7 +126,6 @@ class mcp_logs
$keywords = utf8_normalize_nfc(request_var('keywords', '', true));
$conditions = array(
- 'log_type' => LOG_MOD,
'forum_id' => $forum_list,
'keywords' => $keywords,
);