diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 0c76f7e0f0..dab52ddf16 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -277,7 +277,7 @@ function bbencode_first_pass($text, $uid)
 	$text = preg_replace("#\[i\](.*?)\[/i\]#si", "[i:$uid]\\1[/i:$uid]", $text);
 
 	// [img]image_url_here[/img] code..
-	$text = preg_replace("#\[img\](([a-z]+?)://([^, \n\r]+))\[/img\]#si", "[img:$uid]\\1[/img:$uid]", $text);
+	$text = preg_replace("#\[img\](([a-z]+?)://([^ \n\r]+?))\[/img\]#si", "[img:$uid]\\1[/img:$uid]", $text);
 
 	// Remove our padding from the string..
 	$text = substr($text, 1);
@@ -764,4 +764,4 @@ function smiley_sort($a, $b)
 	return ( strlen($a['code']) > strlen($b['code']) ) ? -1 : 1;
 }
 
-?>
\ No newline at end of file
+?>