diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-04 23:59:21 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-04 23:59:21 +0200 |
| commit | f1314741fb5e888600af25f365cc948c6e11bdd4 (patch) | |
| tree | f4a728d2383792ad866927a4e9f1c0f869cddd25 /phpBB/includes/mcp | |
| parent | b46e68c65de1b6558d63e4fa7fb9e5a35ac11d4b (diff) | |
| parent | f9c0a6b96e12908e76a6835b98c46c27fe0cc322 (diff) | |
| download | forums-f1314741fb5e888600af25f365cc948c6e11bdd4.tar forums-f1314741fb5e888600af25f365cc948c6e11bdd4.tar.gz forums-f1314741fb5e888600af25f365cc948c6e11bdd4.tar.bz2 forums-f1314741fb5e888600af25f365cc948c6e11bdd4.tar.xz forums-f1314741fb5e888600af25f365cc948c6e11bdd4.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_logs.php | 4 |
1 files changed, 1 insertions, 3 deletions
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, ); |