From 36071ded9d37f38d446d17013b90dff9da94245b Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sat, 31 May 2014 12:56:44 +0200 Subject: [ticket/12639] Delete entry in admin-log leads to mysql-error PHPBB3-12639 --- phpBB/includes/acp/acp_logs.php | 2 -- phpBB/includes/mcp/mcp_logs.php | 2 -- 2 files changed, 4 deletions(-) (limited to 'phpBB/includes') diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php index 6b7ed1d269..270cf02be7 100644 --- a/phpBB/includes/acp/acp_logs.php +++ b/phpBB/includes/acp/acp_logs.php @@ -78,8 +78,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..bcaf6277a8 100644 --- a/phpBB/includes/mcp/mcp_logs.php +++ b/phpBB/includes/mcp/mcp_logs.php @@ -115,7 +115,6 @@ class mcp_logs if ($deletemark && sizeof($marked)) { $conditions = array( - 'log_type' => LOG_MOD, 'forum_id' => $forum_list, 'log_id' => $marked, ); @@ -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, ); -- cgit v1.2.1 From 5b5f3a5d0cf323d6eba6508b8cf2a65e6d8293c0 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Mon, 2 Jun 2014 23:12:36 +0200 Subject: [ticket/12639] Send a correct IN entry when deleting marked logs PHPBB3-12639 --- phpBB/includes/acp/acp_logs.php | 2 +- phpBB/includes/mcp/mcp_logs.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/includes') diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php index 270cf02be7..ee9d286f34 100644 --- a/phpBB/includes/acp/acp_logs.php +++ b/phpBB/includes/acp/acp_logs.php @@ -63,7 +63,7 @@ class acp_logs { $sql_in[] = $mark; } - $conditions['log_id'] = $sql_in; + $conditions['log_id'] = array('IN' => $sql_in); unset($sql_in); } diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php index bcaf6277a8..2945e1ec8a 100644 --- a/phpBB/includes/mcp/mcp_logs.php +++ b/phpBB/includes/mcp/mcp_logs.php @@ -116,7 +116,7 @@ class mcp_logs { $conditions = array( 'forum_id' => $forum_list, - 'log_id' => $marked, + 'log_id' => array('IN' => $marked), ); $phpbb_log->delete('mod', $conditions); -- cgit v1.2.1 From 3e31764007dd68ef438bad2a2437ba48707f6831 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Mon, 2 Jun 2014 23:22:36 +0200 Subject: [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs PHPBB3-12639 --- phpBB/includes/acp/acp_logs.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'phpBB/includes') diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php index ee9d286f34..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'] = array('IN' => $sql_in); - unset($sql_in); + $conditions['log_id'] = array('IN' => $marked); } if ($deleteall) -- cgit v1.2.1