diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-27 17:01:46 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-27 17:01:46 -0700 |
| commit | 1f31e8e2439c2f9ccd274ce45cd6a39c3d847cc3 (patch) | |
| tree | 465099b76d54a3a294c396f19bbff89c7a0e9469 /phpBB | |
| parent | aa916fc43f256952eafc81379af9e0b292497044 (diff) | |
| parent | 16d78407db91a1f2762fd99e4ba16a1bdffe9a06 (diff) | |
| download | forums-1f31e8e2439c2f9ccd274ce45cd6a39c3d847cc3.tar forums-1f31e8e2439c2f9ccd274ce45cd6a39c3d847cc3.tar.gz forums-1f31e8e2439c2f9ccd274ce45cd6a39c3d847cc3.tar.bz2 forums-1f31e8e2439c2f9ccd274ce45cd6a39c3d847cc3.tar.xz forums-1f31e8e2439c2f9ccd274ce45cd6a39c3d847cc3.zip | |
Merge branch 'ticket/13229' into prep-release-3.1.0
* ticket/13229:
[ticket/13229] Fix overloading memberlist with redundant SQL queries
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_display.php | 4 | ||||
| -rw-r--r-- | phpBB/memberlist.php | 2 |
2 files changed, 3 insertions, 3 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 && diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 439b97b47f..4f31178ffb 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1427,7 +1427,7 @@ switch ($mode) $cp_row = (isset($profile_fields_cache[$user_id])) ? $cp->generate_profile_fields_template_data($profile_fields_cache[$user_id], false) : array(); } - $memberrow = array_merge(phpbb_show_profile($row), array( + $memberrow = array_merge(phpbb_show_profile($row, false, false, false), array( 'ROW_NUMBER' => $i + ($start + 1), 'S_CUSTOM_PROFILE' => (isset($cp_row['row']) && sizeof($cp_row['row'])) ? true : false, |