Merge remote branch 'upstream/master'

Conflicts:
	include/bbcode.php

diff --cc include/bbcode.php
index eef1cde1f18f6d8cc7ed5546aaaf333039b5419b,32053b4ecdd13941252ef74a269462c2003bc2c7..47822d093cef7618f1ad919a06b3231d434a7c60
--- 1/include/bbcode.php
--- 2/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);