Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 11:50:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	include/bbcode.php
This commit is contained in:
friendica 2012-06-25 16:05:42 -07:00
commit fad2679c7e
5 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/bbcode.php
View file

@ -162,6 +162,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// handle nested lists
$endlessloop = 0;
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)) {