diff options
| author | friendica <info@friendica.com> | 2012-02-26 15:07:34 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-02-26 15:07:34 -0800 |
| commit | 89560edde2fe3fb198b558479e9c2300fc4185fd (patch) | |
| tree | bffb4a563ed2fe1ff02a4221e28c608460c866db /include/bbcode.php | |
| parent | 6ddd444afde33337235eab3aa9d6d1fe12bcb7a4 (diff) | |
| parent | fe3dfbee5638dd2988bd8b126652b3138572f02c (diff) | |
| download | volse-hubzilla-89560edde2fe3fb198b558479e9c2300fc4185fd.tar.gz volse-hubzilla-89560edde2fe3fb198b558479e9c2300fc4185fd.tar.bz2 volse-hubzilla-89560edde2fe3fb198b558479e9c2300fc4185fd.zip | |
Merge pull request #50 from annando/master
massive changes in mail and design updates in "vier"
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r--[-rwxr-xr-x] | include/bbcode.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 32053b4ec..cff26f5c8 100755..100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -151,7 +151,7 @@ function bbcode($Text,$preserve_nl = false) { // handle nested lists $endlessloop = 0; - while (strpos($Text, "[/list]") and strpos($Text, "[list") and (++$endlessloop < 20)) { + while ((strpos($Text, "[/list]") !== false) and (strpos($Text, "[list") !== false) and (++$endlessloop < 20)) { $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' ,$Text); $Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '<ul class="listnone" style="list-style-type: none;">$1</ul>' ,$Text); $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>' ,$Text); @@ -194,7 +194,7 @@ function bbcode($Text,$preserve_nl = false) { // Check for [quote] text // handle nested quotes $endlessloop = 0; - 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)) $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism","$QuoteLayout", $Text); // Check for [quote=Author] text @@ -203,7 +203,7 @@ function bbcode($Text,$preserve_nl = false) { // handle nested quotes $endlessloop = 0; - 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)) $Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism", "<blockquote><strong>" . $t_wrote . "</strong> $2</blockquote>", $Text); @@ -285,3 +285,4 @@ function bbcode($Text,$preserve_nl = false) { return $Text; } + |