From: friendica <info@friendica.com>
Date: Mon, 25 Jun 2012 23:05:42 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fad2679c7e2ac32027ffd42064213ab48762dda2;p=friendica.git

Merge https://github.com/friendica/friendica into pull

Conflicts:
	include/bbcode.php
---

fad2679c7e2ac32027ffd42064213ab48762dda2
diff --cc include/bbcode.php
index 2c1c2378f1,36d480a178..e219d53836
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@@ -162,7 -162,7 +162,8 @@@ function bbcode($Text,$preserve_nl = fa
  
   	// handle nested lists
  	$endlessloop = 0;
 -	while ((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list]") !== false) &&
++
 +	while ((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false) &&
  	       (strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false) && 
  	       (strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false) && (++$endlessloop < 20)) {
  		$Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' ,$Text);