aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-03-04 08:47:47 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-03-04 08:47:47 +0100
commitc650078904e41c9dd468b329131ace2fcbd8d1f9 (patch)
tree871635ccd8f29c257f0a8058c31dd9002df6e979 /phpBB/viewtopic.php
parenta3627a9ff767631121c70a00ca17d99a3533ad31 (diff)
downloadforums-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/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 422227f172..25f577937e 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1248,7 +1248,7 @@ if ($config['load_cpf_viewtopic'])
$cp = $phpbb_container->get('profilefields.manager');
// Grab all profile fields from users in id cache for later use - similar to the poster cache
- $profile_fields_tmp = $cp->generate_profile_fields_template('grab', $id_cache);
+ $profile_fields_tmp = $cp->grab_profile_fields_data($id_cache);
// filter out fields not to be displayed on viewtopic. Yes, it's a hack, but this shouldn't break any MODs.
$profile_fields_cache = array();
@@ -1558,7 +1558,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
//
if ($config['load_cpf_viewtopic'])
{
- $cp_row = (isset($profile_fields_cache[$poster_id])) ? $cp->generate_profile_fields_template('show', false, $profile_fields_cache[$poster_id]) : array();
+ $cp_row = (isset($profile_fields_cache[$poster_id])) ? $cp->generate_profile_fields_template_data($profile_fields_cache[$poster_id]) : array();
}
$post_unread = (isset($topic_tracking_info[$topic_id]) && $row['post_time'] > $topic_tracking_info[$topic_id]) ? true : false;