From: Michael <icarus@dabo.de>
Date: Thu, 23 Feb 2012 19:53:22 +0000 (+0100)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0409b5cdba003b6ce90d5ad0181e81c06af95ab1;p=friendica.git

Merge remote branch 'upstream/master'

Conflicts:
	include/bbcode.php
---

0409b5cdba003b6ce90d5ad0181e81c06af95ab1
diff --cc include/bbcode.php
index eef1cde1f1,32053b4ecd..47822d093c
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@@ -194,7 -194,7 +194,11 @@@ function bbcode($Text,$preserve_nl = fa
  	// 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 -203,7 +207,11 @@@
  
  	// 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);