diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-04 08:47:47 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-04 08:47:47 +0100 |
| commit | c650078904e41c9dd468b329131ace2fcbd8d1f9 (patch) | |
| tree | 871635ccd8f29c257f0a8058c31dd9002df6e979 /phpBB/memberlist.php | |
| parent | a3627a9ff767631121c70a00ca17d99a3533ad31 (diff) | |
| download | forums-c650078904e41c9dd468b329131ace2fcbd8d1f9.tar forums-c650078904e41c9dd468b329131ace2fcbd8d1f9.tar.gz forums-c650078904e41c9dd468b329131ace2fcbd8d1f9.tar.bz2 forums-c650078904e41c9dd468b329131ace2fcbd8d1f9.tar.xz forums-c650078904e41c9dd468b329131ace2fcbd8d1f9.zip | |
[ticket/12187] Split generate_profile_fields_template() into 2 methods
Removing the mode switch that wraps the content of the method
PHPBB3-12187
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index f1ee622445..a05a0999dc 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -618,8 +618,8 @@ switch ($mode) if ($config['load_cpf_viewprofile']) { $cp = $phpbb_container->get('profilefields.manager'); - $profile_fields = $cp->generate_profile_fields_template('grab', $user_id); - $profile_fields = (isset($profile_fields[$user_id])) ? $cp->generate_profile_fields_template('show', false, $profile_fields[$user_id]) : array(); + $profile_fields = $cp->grab_profile_fields_data($user_id); + $profile_fields = (isset($profile_fields[$user_id])) ? $cp->generate_profile_fields_template_data($profile_fields[$user_id]) : array(); } // If the user has m_approve permission or a_user permission, then list then display unapproved posts @@ -1560,7 +1560,7 @@ switch ($mode) if ($config['load_cpf_memberlist']) { // Grab all profile fields from users in id cache for later use - similar to the poster cache - $profile_fields_cache = $cp->generate_profile_fields_template('grab', $user_list); + $profile_fields_cache = $cp->grab_profile_fields_data($user_list); // Filter the fields we don't want to show foreach ($profile_fields_cache as $user_id => $user_profile_fields) @@ -1592,7 +1592,7 @@ switch ($mode) $cp_row = array(); if ($config['load_cpf_memberlist']) { - $cp_row = (isset($profile_fields_cache[$user_id])) ? $cp->generate_profile_fields_template('show', false, $profile_fields_cache[$user_id]) : array(); + $cp_row = (isset($profile_fields_cache[$user_id])) ? $cp->generate_profile_fields_template_data($profile_fields_cache[$user_id]) : array(); } $memberrow = array_merge(show_profile($row), array( |