diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-04 23:59:20 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-04 23:59:20 +0200 |
| commit | f9c0a6b96e12908e76a6835b98c46c27fe0cc322 (patch) | |
| tree | bf82eb9244b7c600fe61aabc0ad7e51453764cd8 /phpBB/includes | |
| parent | 1e7a782fb3d7d43f0338a719376a87170071b178 (diff) | |
| parent | fb46e42ab3393f3899c0aa8b6b4482214ec1d275 (diff) | |
| download | forums-f9c0a6b96e12908e76a6835b98c46c27fe0cc322.tar forums-f9c0a6b96e12908e76a6835b98c46c27fe0cc322.tar.gz forums-f9c0a6b96e12908e76a6835b98c46c27fe0cc322.tar.bz2 forums-f9c0a6b96e12908e76a6835b98c46c27fe0cc322.tar.xz forums-f9c0a6b96e12908e76a6835b98c46c27fe0cc322.zip | |
Merge pull request #2526 from Nicofuma/ticket/12639
[ticket/12639] Delete entry in admin-log leads to mysql-error
* Nicofuma/ticket/12639:
[ticket/12639] Add a space in the code generated by generate_sql_keyword()
[ticket/12639] Handle $conditions['keywords'] outside of the loop
[ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs
[ticket/12639] Send a correct IN entry when deleting marked logs
[ticket/12639] Use assertSame
[ticket/12639] Remove old commented tests
[ticket/12639] Order the results correctly in the test
[ticket/12639] Fix tests on postgres
[ticket/12639] Update tests to use a dataProvider
[ticket/12639] Add a test case with an empty keywords list
[ticket/12639] Delete entry in admin-log leads to mysql-error
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_logs.php | 10 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_logs.php | 4 |
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, ); |