diff --git a/upload/source/function/cache/cache_bbcodes.php b/upload/source/function/cache/cache_bbcodes.php
index f60778eafe54fd4c281313ad76779089a5f4dc5f..461270c0d7d543500a8fd0aededa50acd315e35b 100644
--- a/upload/source/function/cache/cache_bbcodes.php
+++ b/upload/source/function/cache/cache_bbcodes.php
@@ -15,9 +15,9 @@ function build_cache_bbcodes() {
 	$data = array();
 
 	$regexp = array	(
-		1 => "/\[{bbtag}]([^\"\[]+?)\[\/{bbtag}\]/is",
-		2 => "/\[{bbtag}=(['\"]?)([^\"\[]+?)(['\"]?)\]([^\"\[]+?)\[\/{bbtag}\]/is",
-		3 => "/\[{bbtag}=(['\"]?)([^\"\[]+?)(['\"]?),(['\"]?)([^\"\[]+?)(['\"]?)\]([^\"\[]+?)\[\/{bbtag}\]/is"
+		1 => "/\[{bbtag}\](.*?)\[\/{bbtag}\]/is",
+		2 => "/\[{bbtag}=(['\"]?)(.+?)(['\"]?)\](.*?)\[\/{bbtag}\]/is",
+		3 => "/\[{bbtag}=(['\"]?)(.+?)(['\"]?),(['\"]?)(.+?)(['\"]?)\](.*?)\[\/{bbtag}\]/is"
 	);
 
 	foreach(C::t('forum_bbcode')->fetch_all_by_available_icon(0, false, '>') as $bbcode) {