aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-10-09 22:03:18 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-10-09 22:03:18 -0500
commit9d955507b6314ccd52d4d7d42a6d2514f14db9f3 (patch)
treef0343160fdc43c818bb772e86ae6613179de510e /phpBB/includes/mcp
parentb33e5273942c4f67e8168763eec224fd61edaa8f (diff)
parentcf810fb775407d6e6e5aa62a072b141bdb61e3c9 (diff)
downloadforums-9d955507b6314ccd52d4d7d42a6d2514f14db9f3.tar
forums-9d955507b6314ccd52d4d7d42a6d2514f14db9f3.tar.gz
forums-9d955507b6314ccd52d4d7d42a6d2514f14db9f3.tar.bz2
forums-9d955507b6314ccd52d4d7d42a6d2514f14db9f3.tar.xz
forums-9d955507b6314ccd52d4d7d42a6d2514f14db9f3.zip
Merge branch 'ticket/11140' of github.com:EXreaction/phpbb3 into ticket/11103
Diffstat (limited to 'phpBB/includes/mcp')
-rw-r--r--phpBB/includes/mcp/mcp_front.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php
index 13398e62bc..ba4b15895a 100644
--- a/phpBB/includes/mcp/mcp_front.php
+++ b/phpBB/includes/mcp/mcp_front.php
@@ -251,7 +251,7 @@ function mcp_front_view($id, $mode, $action)
'ORDER_BY' => 'p.message_time DESC',
);
- $sql_ary = $db->sql_build_query('SELECT', $sql_ary);
+ $sql = $db->sql_build_query('SELECT', $sql_ary);
$result = $db->sql_query_limit($sql, 5);
$pm_by_id = $pm_list = array();