aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorBart van Bragt <bartvb@users.sourceforge.net>2002-02-17 16:05:18 +0000
committerBart van Bragt <bartvb@users.sourceforge.net>2002-02-17 16:05:18 +0000
commit7533fe4e05d1fc9c4abd8ac54bd3a0ba537f4411 (patch)
tree1a22345006699a2d6efd97dc3846ab0b3a134f44 /phpBB
parent22626dc4ccc48ea1bb9f44a2f27a6507c0595407 (diff)
downloadforums-7533fe4e05d1fc9c4abd8ac54bd3a0ba537f4411.tar
forums-7533fe4e05d1fc9c4abd8ac54bd3a0ba537f4411.tar.gz
forums-7533fe4e05d1fc9c4abd8ac54bd3a0ba537f4411.tar.bz2
forums-7533fe4e05d1fc9c4abd8ac54bd3a0ba537f4411.tar.xz
forums-7533fe4e05d1fc9c4abd8ac54bd3a0ba537f4411.zip
Fixed #506066, [img] didn't work with multiple instances directly following each other
git-svn-id: file:///svn/phpbb/trunk@2175 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/bbcode.php4
1 files changed, 2 insertions, 2 deletions
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
+?>