3 files changed, 35 insertions, 4 deletions
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
index fbb1f0e03d..43952ae57a 100644
--- a/phpBB/includes/functions_compatibility.php
+++ b/phpBB/includes/functions_compatibility.php
@@ -101,18 +101,21 @@ function phpbb_clean_path($path)
 	}
 	else if (!$phpbb_path_helper)
 	{
+		global $phpbb_root_path, $phpEx;
+
 		// The container is not yet loaded, use a new instance
 		if (!class_exists('\phpbb\path_helper'))
 		{
-			global $phpbb_root_path, $phpEx;
 			require($phpbb_root_path . 'phpbb/path_helper.' . $phpEx);
 		}
 
+		$request = new phpbb\request\request();
 		$phpbb_path_helper = new phpbb\path_helper(
 			new phpbb\symfony_request(
-				new phpbb\request\request()
+				$request
 			),
 			new phpbb\filesystem(),
+			$request,
 			$phpbb_root_path,
 			$phpEx
 		);
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 />';
 				}
 			}
 
diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php
index c76ba6e37d..1da5c39401 100644
--- a/tests/functional/memberlist_test.php
+++ b/tests/functional/memberlist_test.php
@@ -106,4 +106,32 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
 		$this->assertContains('admin', $crawler->eq(0)->text());
 		$this->assertNotContains('admin', $crawler->eq(1)->text());
 	}
+
+	public function test_group_rank()
+	{
+		copy(__DIR__ . '/fixtures/files/valid.jpg', __DIR__ . '/../../phpBB/images/ranks/valid.jpg');
+
+		$this->login();
+		$this->admin_login();
+		$this->add_lang(array('acp/groups', 'acp/posting'));
+
+		// Set a group rank to the registered users
+		$crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_groups&mode=manage&action=edit&g=2");
+		$form = $crawler->selectButton('Submit')->form();
+		$form['group_rank']->select('1');
+		$crawler = self::submit($form);
+		$this->assertContainsLang('GROUP_UPDATED', $crawler->filter('.successbox')->text());
+
+		// Set a rank image for site_admin
+		$crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_ranks&mode=ranks&action=edit&id=1");
+		$form = $crawler->selectButton('Submit')->form();
+		$form['rank_image']->select('valid.jpg');
+		$crawler = self::submit($form);
+		$this->assertContainsLang('RANK_UPDATED', $crawler->filter('.successbox')->text());
+
+		$crawler = self::request('GET', 'memberlist.php?mode=group&g=2');
+		$this->assertContains('memberlist-test-user', $crawler->text());
+
+		unlink(__DIR__ . '/../../phpBB/images/ranks/valid.jpg');
+	}
 }