diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-05-31 12:56:44 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-05-31 12:56:44 +0200 |
| commit | 36071ded9d37f38d446d17013b90dff9da94245b (patch) | |
| tree | 95a0568c9636b589c35b537798ede6462752dec0 | |
| parent | f4dcb69dae9964c7d6ca9d06828d773a63a3abed (diff) | |
| download | forums-36071ded9d37f38d446d17013b90dff9da94245b.tar forums-36071ded9d37f38d446d17013b90dff9da94245b.tar.gz forums-36071ded9d37f38d446d17013b90dff9da94245b.tar.bz2 forums-36071ded9d37f38d446d17013b90dff9da94245b.tar.xz forums-36071ded9d37f38d446d17013b90dff9da94245b.zip | |
[ticket/12639] Delete entry in admin-log leads to mysql-error
PHPBB3-12639
| -rw-r--r-- | phpBB/includes/acp/acp_logs.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_logs.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/log/log.php | 4 |
3 files changed, 2 insertions, 6 deletions
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, ); diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index 453cb740bb..6217a7fe46 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -393,14 +393,14 @@ class log implements \phpbb\log\log_interface $sql_where = 'WHERE log_type = ' . $log_type; foreach ($conditions as $field => $field_value) { - $sql_where .= ' AND '; - if ($field == 'keywords') { $sql_where .= $this->generate_sql_keyword($field_value, '', ''); } else { + $sql_where .= ' AND '; + if (is_array($field_value) && sizeof($field_value) == 2 && !is_array($field_value[1])) { $sql_where .= $field . ' ' . $field_value[0] . ' ' . $field_value[1]; |