aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-10-27 12:25:18 -0700
committerNils Adermann <naderman@naderman.de>2014-10-27 12:25:18 -0700
commitd693d91e26e3200916b0f7fd475de1e968a43fee (patch)
tree23a6d10030bf0a2c73a10eb4e2128fed7887a9c0 /phpBB
parentdecabb62c0a6cecd80ecfc54bd0637fa9a446a0e (diff)
parent2e5cc620719a9a26a936c9f808eedf9f77220df2 (diff)
downloadforums-d693d91e26e3200916b0f7fd475de1e968a43fee.tar
forums-d693d91e26e3200916b0f7fd475de1e968a43fee.tar.gz
forums-d693d91e26e3200916b0f7fd475de1e968a43fee.tar.bz2
forums-d693d91e26e3200916b0f7fd475de1e968a43fee.tar.xz
forums-d693d91e26e3200916b0f7fd475de1e968a43fee.zip
Merge remote-tracking branch 'github-nicofuma/ticket/13226' into prep-release-3.1.0
* github-nicofuma/ticket/13226: [ticket/13226] Add functional test for group ranks [ticket/13226] Fix the usage of $rank_img
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/memberlist.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index e3ac8dad51..439b97b47f 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1089,9 +1089,9 @@ switch ($mode)
{
$user_rank_data = phpbb_get_user_rank($group_row, false);
- if ($rank_img)
+ if ($user_rank_data['img'])
{
- $rank_img .= '<br />';
+ $user_rank_data['img'] .= '<br />';
}
}