aboutsummaryrefslogtreecommitdiffstats
path: root/include/html2bbcode.php
diff options
context:
space:
mode:
authorTobias Hößl <tobias@hoessl.eu>2012-02-28 21:19:02 +0000
committerTobias Hößl <tobias@hoessl.eu>2012-02-28 21:19:02 +0000
commit3d249f0eddb058f74b33d8205202b17ab7555aa6 (patch)
tree112e38aa464e5830832ff92a93e10f2566cbe27e /include/html2bbcode.php
parent36a1a43f06dc2a0d55463c83154cce55fa3948ad (diff)
parent733f830be4b554c83361e877a5f1108767a815fc (diff)
downloadvolse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.tar.gz
volse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.tar.bz2
volse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/html2bbcode.php')
-rwxr-xr-xinclude/html2bbcode.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index d8f1a24f1..65920380b 100755
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -258,7 +258,7 @@ function html2bbcode($message)
"[hr]\n",
"\n[list",
"[/list]\n",
- "\n[/list]",
+ "\n[/",
"[list]\n",
"[list=1]\n",
"\n[*]"),
@@ -268,7 +268,7 @@ function html2bbcode($message)
"[hr]",
"[list",
"[/list]",
- "[/list]",
+ "[/",
"[list]",
"[list=1]",
"[*]"),