diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 77328ee4d9..0582f235e0 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -367,7 +367,6 @@ class parser implements \phpbb\textformatter\parser_interface
 	{
 		// Validate the URL
 		$url = BuiltInFilters::filterUrl($url, $url_config, $logger);
-
 		if ($url === false)
 		{
 			return false;
@@ -375,26 +374,23 @@ class parser implements \phpbb\textformatter\parser_interface
 
 		if ($max_height || $max_width)
 		{
-			$stats = @getimagesize($url);
-
-			if ($stats === false)
+			$imagesize = new \phpbb\upload\imagesize();
+			$size_info = $imagesize->get_imagesize($url);
+			if ($size_info === false)
 			{
 				$logger->err('UNABLE_GET_IMAGE_SIZE');
-
 				return false;
 			}
 
-			if ($max_height && $max_height < $stats[1])
+			if ($max_height && $max_height < $size_info['height'])
 			{
 				$logger->err('MAX_IMG_HEIGHT_EXCEEDED', array('max_height' => $max_height));
-
 				return false;
 			}
 
-			if ($max_width && $max_width < $stats[0])
+			if ($max_width && $max_width < $size_info['width'])
 			{
 				$logger->err('MAX_IMG_WIDTH_EXCEEDED', array('max_width' => $max_width));
-
 				return false;
 			}
 		}
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 09fec38013..0f9b049f44 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -458,6 +458,10 @@ class phpbb_test_case_helpers
 		{
 			$dispatcher = new phpbb_mock_event_dispatcher;
 		}
+		if (!isset($phpbb_dispatcher))
+		{
+			$phpbb_dispatcher = $dispatcher;
+		}
 
 		// Create and register the text_formatter.s9e.factory service
 		$factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $dispatcher, $cache_dir, $cache_key_parser, $cache_key_renderer);