aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_display.php
diff options
context:
space:
mode:
authorrxu <rxu@mail.ru>2014-10-27 21:43:10 +0700
committerNils Adermann <naderman@naderman.de>2014-10-27 17:01:29 -0700
commit16d78407db91a1f2762fd99e4ba16a1bdffe9a06 (patch)
tree465099b76d54a3a294c396f19bbff89c7a0e9469 /phpBB/includes/functions_display.php
parentaa916fc43f256952eafc81379af9e0b292497044 (diff)
downloadforums-16d78407db91a1f2762fd99e4ba16a1bdffe9a06.tar
forums-16d78407db91a1f2762fd99e4ba16a1bdffe9a06.tar.gz
forums-16d78407db91a1f2762fd99e4ba16a1bdffe9a06.tar.bz2
forums-16d78407db91a1f2762fd99e4ba16a1bdffe9a06.tar.xz
forums-16d78407db91a1f2762fd99e4ba16a1bdffe9a06.zip
[ticket/13229] Fix overloading memberlist with redundant SQL queries
PHPBB3-13229
Diffstat (limited to 'phpBB/includes/functions_display.php')
-rw-r--r--phpBB/includes/functions_display.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 745eb20c77..48c34ecfe6 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1491,7 +1491,7 @@ function phpbb_get_user_rank($user_data, $user_posts)
/**
* Prepare profile data
*/
-function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabled = false)
+function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabled = false, $check_can_receive_pm = true)
{
global $config, $auth, $user, $phpEx, $phpbb_root_path, $phpbb_dispatcher;
@@ -1559,7 +1559,7 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl
}
// Can this user receive a Private Message?
- $can_receive_pm = (
+ $can_receive_pm = $check_can_receive_pm && (
// They must be a "normal" user
$data['user_type'] != USER_IGNORE &&