diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-23 22:34:17 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-23 22:34:17 +0200 |
| commit | 7575c478c79f7b8989cc6a8d2092bfd05ea1693d (patch) | |
| tree | 4d8af239c4890d7aa160ab04396d80a8e1a68fe8 | |
| parent | 83326718132811d8b57ac8612ff50887ec0fa101 (diff) | |
| download | forums-7575c478c79f7b8989cc6a8d2092bfd05ea1693d.tar forums-7575c478c79f7b8989cc6a8d2092bfd05ea1693d.tar.gz forums-7575c478c79f7b8989cc6a8d2092bfd05ea1693d.tar.bz2 forums-7575c478c79f7b8989cc6a8d2092bfd05ea1693d.tar.xz forums-7575c478c79f7b8989cc6a8d2092bfd05ea1693d.zip | |
[ticket/12612] Prefix show_profile() with phpbb and delete unused global
PHPBB3-12612
| -rw-r--r-- | phpBB/includes/functions_display.php | 4 | ||||
| -rw-r--r-- | phpBB/memberlist.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 87d32391b3..c6867d5e2e 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1448,9 +1448,9 @@ function phpbb_gen_download_links($param_key, $param_val, $phpbb_root_path, $php /** * Prepare profile data */ -function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = false) +function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabled = false) { - global $config, $auth, $template, $user, $phpEx, $phpbb_root_path, $phpbb_dispatcher; + global $config, $auth, $user, $phpEx, $phpbb_root_path, $phpbb_dispatcher; $username = $data['username']; $user_id = $data['user_id']; diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index c4d0a5258d..7bf7f111c2 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -640,7 +640,7 @@ switch ($mode) ); extract($phpbb_dispatcher->trigger_event('core.memberlist_view_profile', compact($vars))); - $template->assign_vars(show_profile($member, $user_notes_enabled, $warn_user_enabled)); + $template->assign_vars(phpbb_show_profile($member, $user_notes_enabled, $warn_user_enabled)); // If the user has m_approve permission or a_user permission, then list then display unapproved posts if ($auth->acl_getf_global('m_approve') || $auth->acl_get('a_user')) @@ -1416,7 +1416,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(show_profile($row), array( + $memberrow = array_merge(phpbb_show_profile($row), array( 'ROW_NUMBER' => $i + ($start + 1), 'S_CUSTOM_PROFILE' => (isset($cp_row['row']) && sizeof($cp_row['row'])) ? true : false, |