diff options
| author | friendica <info@friendica.com> | 2012-06-25 16:05:42 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-06-25 16:05:42 -0700 |
| commit | fad2679c7e2ac32027ffd42064213ab48762dda2 (patch) | |
| tree | 05e9ef81c479ccd5cc3973412d00e5cad03c806e /include | |
| parent | b044cd922d389b5bb9367ce1004d00a711562cf9 (diff) | |
| parent | c291581e13c139fd7575cc7425ac8495dfc5b866 (diff) | |
| download | volse-hubzilla-fad2679c7e2ac32027ffd42064213ab48762dda2.tar.gz volse-hubzilla-fad2679c7e2ac32027ffd42064213ab48762dda2.tar.bz2 volse-hubzilla-fad2679c7e2ac32027ffd42064213ab48762dda2.zip | |
Merge https://github.com/friendica/friendica into pull
Conflicts:
include/bbcode.php
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 2c1c2378f..e219d5383 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -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)) { |