makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 14:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12612] Prefix show_profile() with phpbb and delete unused global

Browse source 
PHPBB3-12612
This commit is contained in:
Joas Schilling 2014-06-23 22:34:17 +02:00
parent 8332671813
commit 7575c478c7
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions_display.php
View file

@ -1448,9 +1448,9 @@ function phpbb_gen_download_links($param_key, $param_val, $phpbb_root_path, $php
/** /**
* Prepare profile data * 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']; $username = $data['username'];
$user_id = $data['user_id']; $user_id = $data['user_id'];

4
phpBB/memberlist.php
View file

@ -640,7 +640,7 @@ switch ($mode)
); );
extract($phpbb_dispatcher->trigger_event('core.memberlist_view_profile', compact($vars))); 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 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')) 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(); $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), 'ROW_NUMBER' => $i + ($start + 1),
'S_CUSTOM_PROFILE' => (isset($cp_row['row']) && sizeof($cp_row['row'])) ? true : false, 'S_CUSTOM_PROFILE' => (isset($cp_row['row']) && sizeof($cp_row['row'])) ? true : false,