mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 18:26:32 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'crizz0/ticket/9758' into develop-ascraeus

Browse Source 
* crizz0/ticket/9758:
  [ticket/9758] Clickable avatar in header and renamed class for avatar-img
  [ticket/9758] Remove unnessary if-question for include functions_display
  [ticket/9758] Slims the line 4775 in includes/functions.php
  [ticket/9758] Adds id and changes filter to fix travis CI test
  [ticket/9758] Removed the needless space after first ENDIF
  [ticket/9758] Adding impr. for overall_header display of avatar and username
  [ticket/9758] Fixed bug in mcp_warn.php
  [ticket/9758] Optimises the html code of avatar image in header
  [ticket/9758] Error because of missing functions_display.php fixed
  [ticket/9758] Removed useless if-conditions to include functions.php
  [ticket/9758] Changes class name of new "span" in overall_header.html
  [ticket/9758] Adds global template variable CURRENT_USER_AVATAR
This commit is contained in:
Joas Schilling
2014-03-31 20:29:45 +02:00
parent a618710a69 fa6c1044b8
commit ba84268d4e
11 changed files with 107 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/ucp/ucp_pm_viewmessage.php
View File

@@ -338,13 +338,13 @@ function get_user_information($user_id, $user_row)
}
}
if (!function_exists('phpbb_get_user_avatar'))
$user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : '';
if (!function_exists('get_user_rank'))
{
include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
}
$user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : '';
get_user_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']);
if ((!empty($user_row['user_allow_viewemail']) && $auth->acl_get('u_sendemail')) || $auth->acl_get('a_email'))

4
phpBB/includes/ucp/ucp_profile.php
View File

@@ -515,10 +515,6 @@ class ucp_profile
break;
case 'avatar':
if (!function_exists('phpbb_get_user_avatar'))
{
include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
}
add_form_key('ucp_avatar');