diff options
| author | Michael <icarus@dabo.de> | 2012-02-23 20:59:34 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-23 20:59:34 +0100 |
| commit | 484a442f2b1072fe714174f4f782aa7d15818e72 (patch) | |
| tree | 62bfc6f2c5058ce1e8cfd978f0b9177564725245 /include | |
| parent | 0409b5cdba003b6ce90d5ad0181e81c06af95ab1 (diff) | |
| download | volse-hubzilla-484a442f2b1072fe714174f4f782aa7d15818e72.tar.gz volse-hubzilla-484a442f2b1072fe714174f4f782aa7d15818e72.tar.bz2 volse-hubzilla-484a442f2b1072fe714174f4f782aa7d15818e72.zip | |
GIT problems ...
Diffstat (limited to 'include')
| -rw-r--r--[-rwxr-xr-x] | include/bbcode.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 47822d093..cff26f5c8 100755..100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -194,11 +194,7 @@ 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 @@ -207,11 +203,7 @@ 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); @@ -293,3 +285,4 @@ function bbcode($Text,$preserve_nl = false) { return $Text; } + |