aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-02-23 20:59:34 +0100
committerMichael <icarus@dabo.de>2012-02-23 20:59:34 +0100
commit484a442f2b1072fe714174f4f782aa7d15818e72 (patch)
tree62bfc6f2c5058ce1e8cfd978f0b9177564725245 /include
parent0409b5cdba003b6ce90d5ad0181e81c06af95ab1 (diff)
downloadvolse-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.php9
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;
}
+