diff options
Diffstat (limited to 'include/bbcode.php')
| -rwxr-xr-x | include/bbcode.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index eef1cde1f..47822d093 100755 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -194,7 +194,11 @@ function bbcode($Text,$preserve_nl = false) { // Check for [quote] text // handle nested quotes $endlessloop = 0; +<<<<<<< HEAD while ((strpos($Text, "[/quote]") !== false) and (strpos($Text, "[quote]") !== false) and (++$endlessloop < 20)) +======= + while (strpos($Text, "[/quote]") !== false and strpos($Text, "[quote]") !== false and (++$endlessloop < 20)) +>>>>>>> upstream/master $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism","$QuoteLayout", $Text); // Check for [quote=Author] text @@ -203,7 +207,11 @@ function bbcode($Text,$preserve_nl = false) { // handle nested quotes $endlessloop = 0; +<<<<<<< HEAD while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20)) +======= + while (strpos($Text, "[/quote]") !== false and strpos($Text, "[quote=") !== false and (++$endlessloop < 20)) +>>>>>>> upstream/master $Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism", "<blockquote><strong>" . $t_wrote . "</strong> $2</blockquote>", $Text); |