From 685bdc87e6480597c7d7f30a7b9477c543099d2e Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Mon, 18 Aug 2014 14:04:11 +0200 Subject: [ticket/12993] Fix user_loader and memberlist PHPBB3-12993 --- phpBB/phpbb/user_loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/phpbb') diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php index c9707ee432..e6a2429163 100644 --- a/phpBB/phpbb/user_loader.php +++ b/phpBB/phpbb/user_loader.php @@ -223,7 +223,7 @@ class user_loader 'rank_img_src', ); - get_user_rank($user['user_rank'], (($user['user_id'] == ANONYMOUS) ? false : $user['user_posts']), $rank['rank_title'], $rank['rank_img'], $rank['rank_img_src']); + get_user_rank($user, (($user['user_id'] == ANONYMOUS) ? false : $user['user_posts']), $rank['rank_title'], $rank['rank_img'], $rank['rank_img_src']); return $rank; } -- cgit v1.2.1 From 496cc64bc63befc2bb6f250e1712cd5a00986aef Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Mon, 18 Aug 2014 16:13:32 +0200 Subject: [ticket/12993] Rename to phpbb_get_user_rank PHPBB3-12993 --- phpBB/phpbb/user_loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/phpbb') diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php index e6a2429163..35199d8864 100644 --- a/phpBB/phpbb/user_loader.php +++ b/phpBB/phpbb/user_loader.php @@ -223,7 +223,7 @@ class user_loader 'rank_img_src', ); - get_user_rank($user, (($user['user_id'] == ANONYMOUS) ? false : $user['user_posts']), $rank['rank_title'], $rank['rank_img'], $rank['rank_img_src']); + phpbb_get_user_rank($user, (($user['user_id'] == ANONYMOUS) ? false : $user['user_posts']), $rank['rank_title'], $rank['rank_img'], $rank['rank_img_src']); return $rank; } -- cgit v1.2.1 From 5e7d9d2fcf5a78ef97287c635310c6ea28572464 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Mon, 18 Aug 2014 18:44:23 +0200 Subject: [ticket/12993] Fix includes of functions_display PHPBB3-12993 --- phpBB/phpbb/user_loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/phpbb') diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php index 35199d8864..4da2b383c6 100644 --- a/phpBB/phpbb/user_loader.php +++ b/phpBB/phpbb/user_loader.php @@ -212,7 +212,7 @@ class user_loader return ''; } - if (!function_exists('get_user_rank')) + if (!function_exists('phpbb_get_user_rank')) { include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); } -- cgit v1.2.1 From fe1ab6d2efe7389ab5deb6cab0d721a1fa80c503 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Tue, 19 Aug 2014 22:25:01 +0200 Subject: [ticket/12993] Return an array instead of reference passing PHPBB3-12993 --- phpBB/phpbb/user_loader.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'phpBB/phpbb') diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php index 4da2b383c6..24e663b150 100644 --- a/phpBB/phpbb/user_loader.php +++ b/phpBB/phpbb/user_loader.php @@ -223,7 +223,10 @@ class user_loader 'rank_img_src', ); - phpbb_get_user_rank($user, (($user['user_id'] == ANONYMOUS) ? false : $user['user_posts']), $rank['rank_title'], $rank['rank_img'], $rank['rank_img_src']); + $user_rank_data = phpbb_get_user_rank($user, (($user['user_id'] == ANONYMOUS) ? false : $user['user_posts'])); + $rank['rank_title'] = $user_rank_data['title']; + $rank['rank_img'] = $user_rank_data['img']; + $rank['rank_img_src'] = $user_rank_data['img_src']; return $rank; } -- cgit v1.2.1