aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon <simon@kisikew.org>2012-06-25 15:50:35 -0700
committerSimon <simon@kisikew.org>2012-06-25 15:50:35 -0700
commitc291581e13c139fd7575cc7425ac8495dfc5b866 (patch)
tree23fac83ac88374c472778caa1b3b8d9a2f45a366
parent33b7cd32a69622b2067224f7ebe888228f4330d9 (diff)
parent939ebe16f82f4aca9b4d0cf70960fe6495fae49c (diff)
downloadvolse-hubzilla-c291581e13c139fd7575cc7425ac8495dfc5b866.tar.gz
volse-hubzilla-c291581e13c139fd7575cc7425ac8495dfc5b866.tar.bz2
volse-hubzilla-c291581e13c139fd7575cc7425ac8495dfc5b866.zip
Merge pull request #363 from simonlnu/master
fix typo and syntax error in include/bbcode.php
-rw-r--r--include/bbcode.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 38d1e658f..36d480a17 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -162,7 +162,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// 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);