Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ticket/649] Use phpbb_get_user_rank() instead of deprecated function

Browse Source 
B3P-649
This commit is contained in:
Marc Alexander
2015-09-13 18:18:48 +02:00
parent 6971392003
commit 0845725ded
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/random_member.php
View File

@@ -108,8 +108,7 @@ class random_member extends module_base
$avatar_img = phpbb_get_avatar(\phpbb\avatar\manager::clean_row($row, 'user'), 'USER_AVATAR'); $avatar_img = phpbb_get_avatar(\phpbb\avatar\manager::clean_row($row, 'user'), 'USER_AVATAR');
$rank_title = $rank_img = $rank_img_src = ''; $rank_data = phpbb_get_user_rank($row, $row['user_posts']);
get_user_rank($row['user_rank'], $row['user_posts'], $rank_title, $rank_img, $rank_img_src);
$username = $row['username']; $username = $row['username'];
$user_id = (int) $row['user_id']; $user_id = (int) $row['user_id'];
@@ -121,9 +120,9 @@ class random_member extends module_base
'USER_COLOR' => get_username_string('colour', $user_id, $username, $colour), 'USER_COLOR' => get_username_string('colour', $user_id, $username, $colour),
'U_VIEW_PROFILE' => get_username_string('profile', $user_id, $username, $colour), 'U_VIEW_PROFILE' => get_username_string('profile', $user_id, $username, $colour),
'RANK_TITLE' => $rank_title, 'RANK_TITLE' => $rank_data['title'],
'RANK_IMG' => $rank_img, 'RANK_IMG' => $rank_data['img'],
'RANK_IMG_SRC' => $rank_img_src, 'RANK_IMG_SRC' => $rank_data['img_src'],
'USER_POSTS' => (int) $row['user_posts'], 'USER_POSTS' => (int) $row['user_posts'],
'AVATAR_IMG' => $avatar_img, 'AVATAR_IMG' => $avatar_img,

11
modules/user_menu.php
View File

@@ -99,7 +99,7 @@ class user_menu extends module_base
*/ */
public function get_template_side($module_id) public function get_template_side($module_id)
{ {
if (!function_exists('get_user_rank')) if (!function_exists('phpbb_get_user_rank'))
{ {
include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
} }
@@ -147,8 +147,7 @@ class user_menu extends module_base
$username = $this->user->data['username']; $username = $this->user->data['username'];
$colour = $this->user->data['user_colour']; $colour = $this->user->data['user_colour'];
$avatar_img = phpbb_get_avatar(\phpbb\avatar\manager::clean_row($this->user->data, 'user'), 'USER_AVATAR'); $avatar_img = phpbb_get_avatar(\phpbb\avatar\manager::clean_row($this->user->data, 'user'), 'USER_AVATAR');
$rank_title = $rank_img = $rank_img_src = ''; $rank_data = phpbb_get_user_rank($this->user->data, $this->user->data['user_posts']);
\get_user_rank($this->user->data['user_rank'], $this->user->data['user_posts'], $rank_title, $rank_img, $rank_img_src);
// Assign specific vars // Assign specific vars
$this->template->assign_vars(array( $this->template->assign_vars(array(
@@ -157,9 +156,9 @@ class user_menu extends module_base
'L_UNREAD_POSTS'=> $this->user->lang['SEARCH_UNREAD'] . ' (' . $unread_posts_count . ')', 'L_UNREAD_POSTS'=> $this->user->lang['SEARCH_UNREAD'] . ' (' . $unread_posts_count . ')',
'B3P_AVATAR_IMG' => $avatar_img, 'B3P_AVATAR_IMG' => $avatar_img,
'B3P_RANK_TITLE' => $rank_title, 'B3P_RANK_TITLE' => $rank_data['title'],
'B3P_RANK_IMG' => $rank_img, 'B3P_RANK_IMG' => $rank_data['img'],
'RANK_IMG_SRC' => $rank_img_src, 'RANK_IMG_SRC' => $rank_data['img_src'],
'USERNAME_FULL' => get_username_string('full', $user_id, $username, $colour), 'USERNAME_FULL' => get_username_string('full', $user_id, $username, $colour),
'U_VIEW_PROFILE' => get_username_string('profile', $user_id, $username, $colour), 'U_VIEW_PROFILE' => get_username_string('profile', $user_id, $username, $colour),