From a34334b74e3301ba07a86aa719b32884d230e06d Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Fri, 4 Oct 2019 14:19:45 +0200
Subject: [PATCH 1/3] [ticket/16172] Add group rank label to group view

PHPBB3-16172
---
 phpBB/styles/prosilver/template/memberlist_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 745f9a58a8..088d837ba8 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -29,7 +29,7 @@
 			<!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ENDIF -->
 			{% EVENT memberlist_body_group_rank_before %}
 			<!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF -->
-			<!-- IF GROUP_RANK -->{GROUP_RANK}<!-- ENDIF -->
+			<!-- IF GROUP_RANK -->{{ lang('GROUP_RANK') ~ lang('COLON') }} {GROUP_RANK}<!-- ENDIF -->
 			{% EVENT memberlist_body_group_rank_after %}
 		</p>
 	<!-- ELSE -->

From 281d5435bde227fc443e7fc6fdc7c1392809aeb6 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Mon, 7 Oct 2019 13:55:18 +0200
Subject: [PATCH 2/3] [ticket/16172] Only display the label when rank image is
 not present

PHPBB3-16172
---
 phpBB/styles/prosilver/template/memberlist_body.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 088d837ba8..2b8c9dc53a 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -29,7 +29,12 @@
 			<!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ENDIF -->
 			{% EVENT memberlist_body_group_rank_before %}
 			<!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF -->
-			<!-- IF GROUP_RANK -->{{ lang('GROUP_RANK') ~ lang('COLON') }} {GROUP_RANK}<!-- ENDIF -->
+			<!-- IF GROUP_RANK -->
+				<!-- IF not RANK_IMG -->
+					{{ lang('GROUP_RANK') ~ lang('COLON') }}
+				<!-- ENDIF -->
+				{GROUP_RANK}
+			<!-- ENDIF -->
 			{% EVENT memberlist_body_group_rank_after %}
 		</p>
 	<!-- ELSE -->

From dcf733a1e76150fbb5cecce14cc6568af4c93968 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Tue, 8 Oct 2019 09:37:47 +0200
Subject: [PATCH 3/3] [ticket/16172] Use twig

PHPBB3-16172
---
 phpBB/styles/prosilver/template/memberlist_body.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 2b8c9dc53a..b8ff092372 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -28,13 +28,13 @@
 		<p>
 			<!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ENDIF -->
 			{% EVENT memberlist_body_group_rank_before %}
-			<!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF -->
-			<!-- IF GROUP_RANK -->
-				<!-- IF not RANK_IMG -->
+			{% if RANK_IMG %}{{ RANK_IMG }}{% endif %}
+			{% if GROUP_RANK %}
+				{% if not RANK_IMG %}
 					{{ lang('GROUP_RANK') ~ lang('COLON') }}
-				<!-- ENDIF -->
-				{GROUP_RANK}
-			<!-- ENDIF -->
+				{% endif %}
+				{{ GROUP_RANK }}
+			{% endif %}
 			{% EVENT memberlist_body_group_rank_after %}
 		</p>
 	<!-- ELSE -->