From: Michael <icarus@dabo.de>
Date: Thu, 23 Feb 2012 19:59:34 +0000 (+0100)
Subject: GIT problems ...
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=484a442f2b1072fe714174f4f782aa7d15818e72;p=friendica.git

GIT problems ...
---

diff --git a/include/bbcode.php b/include/bbcode.php
old mode 100755
new mode 100644
index 47822d093c..cff26f5c8e
--- 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;
 }
+