2 files changed, 7 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 />';
 				}
 			}