diff options
author | Andreas Fischer <bantu@phpbb.com> | 2015-09-22 19:14:34 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2015-09-22 19:14:34 +0200 |
commit | 85718e63f10adae87c37c223b4c21362e5c56ff1 (patch) | |
tree | 87b1fe114a99dcee30b8827d16d9f0b925392427 /phpBB/includes/functions_mcp.php | |
parent | 692db1ad2bbe91cc61a4872255b21e4af748e908 (diff) | |
parent | 7e379c4cea5452dad81adbc508b205badf49d25f (diff) | |
download | forums-85718e63f10adae87c37c223b4c21362e5c56ff1.tar forums-85718e63f10adae87c37c223b4c21362e5c56ff1.tar.gz forums-85718e63f10adae87c37c223b4c21362e5c56ff1.tar.bz2 forums-85718e63f10adae87c37c223b4c21362e5c56ff1.tar.xz forums-85718e63f10adae87c37c223b4c21362e5c56ff1.zip |
Merge branch '3.1.x'
* 3.1.x:
[ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()
Diffstat (limited to 'phpBB/includes/functions_mcp.php')
-rw-r--r-- | phpBB/includes/functions_mcp.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_mcp.php b/phpBB/includes/functions_mcp.php index 46e85c5674..50acbebd4f 100644 --- a/phpBB/includes/functions_mcp.php +++ b/phpBB/includes/functions_mcp.php @@ -389,7 +389,7 @@ function phpbb_mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by if (!$auth->acl_get('m_approve', $forum_id)) { - $sql .= 'AND topic_visibility = ' . ITEM_APPROVED; + $sql .= ' AND topic_visibility = ' . ITEM_APPROVED; } break; @@ -405,7 +405,7 @@ function phpbb_mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by if (!$auth->acl_get('m_approve', $forum_id)) { - $sql .= 'AND post_visibility = ' . ITEM_APPROVED; + $sql .= ' AND post_visibility = ' . ITEM_APPROVED; } break; |