aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-06-04 20:22:22 +0200
committerTristan Darricau <github@nicofuma.fr>2014-06-04 20:22:22 +0200
commitfb46e42ab3393f3899c0aa8b6b4482214ec1d275 (patch)
tree2347e79169f5dcce2f7e25733bdc34c2111c06e8 /phpBB/phpbb
parentf980fed5d26e2a7d2e1c139da7e1d8be7c1523e3 (diff)
downloadforums-fb46e42ab3393f3899c0aa8b6b4482214ec1d275.tar
forums-fb46e42ab3393f3899c0aa8b6b4482214ec1d275.tar.gz
forums-fb46e42ab3393f3899c0aa8b6b4482214ec1d275.tar.bz2
forums-fb46e42ab3393f3899c0aa8b6b4482214ec1d275.tar.xz
forums-fb46e42ab3393f3899c0aa8b6b4482214ec1d275.zip
[ticket/12639] Add a space in the code generated by generate_sql_keyword()
PHPBB3-12639
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/log/log.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php
index d2c946d28b..10efe5fd1c 100644
--- a/phpBB/phpbb/log/log.php
+++ b/phpBB/phpbb/log/log.php
@@ -394,7 +394,7 @@ class log implements \phpbb\log\log_interface
if (isset($conditions['keywords']))
{
- $sql_where .= $this->generate_sql_keyword($conditions['keywords'], '', ' AND');
+ $sql_where .= $this->generate_sql_keyword($conditions['keywords'], '');
unset($conditions['keywords']);
}
@@ -782,7 +782,7 @@ class log implements \phpbb\log\log_interface
}
}
- $sql_keywords = $statement_operator . ' (';
+ $sql_keywords = ' ' . $statement_operator . ' (';
if (!empty($operations))
{
$sql_keywords .= $this->db->sql_in_set($table_alias . 'log_operation', $operations) . ' OR ';