diff options
| author | Tobias Hößl <tobias@hoessl.eu> | 2012-02-28 21:19:02 +0000 |
|---|---|---|
| committer | Tobias Hößl <tobias@hoessl.eu> | 2012-02-28 21:19:02 +0000 |
| commit | 3d249f0eddb058f74b33d8205202b17ab7555aa6 (patch) | |
| tree | 112e38aa464e5830832ff92a93e10f2566cbe27e /include/bbcode.php | |
| parent | 36a1a43f06dc2a0d55463c83154cce55fa3948ad (diff) | |
| parent | 733f830be4b554c83361e877a5f1108767a815fc (diff) | |
| download | volse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.tar.gz volse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.tar.bz2 volse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.zip | |
Merge remote branch 'upstream/master'
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; } + |