makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
* 3.1.x:
  [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()
This commit is contained in:
Andreas Fischer 2015-09-22 19:14:34 +02:00
commit 85718e63f1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions_mcp.php
View file

@ -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)) if (!$auth->acl_get('m_approve', $forum_id))
{ {
$sql .= 'AND topic_visibility = ' . ITEM_APPROVED; $sql .= ' AND topic_visibility = ' . ITEM_APPROVED;
} }
break; 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)) if (!$auth->acl_get('m_approve', $forum_id))
{ {
$sql .= 'AND post_visibility = ' . ITEM_APPROVED; $sql .= ' AND post_visibility = ' . ITEM_APPROVED;
} }
break; break;