From: Cyprien Mangin <cyprien.mangin@m4x.org>
Date: Wed, 4 Apr 2012 23:51:18 +0000 (+0200)
Subject: Fixes lists in miniwiki.
X-Git-Tag: core/1.1.7~3
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=571e48acadea9f5d2e5073fd993746ec33c369d1;p=platal.git

Fixes lists in miniwiki.

It actually forbids nested lists, but the miniwiki syntax was ambiguous
for these.

Signed-off-by: Cyprien Mangin <cyprien.mangin@m4x.org>
---

diff --git a/classes/miniwiki.php b/classes/miniwiki.php
index d33fc05..280ac7d 100644
--- a/classes/miniwiki.php
+++ b/classes/miniwiki.php
@@ -42,11 +42,11 @@ class MiniWiki
 
         // * unordered list
         MiniWiki::Markup("/(^|\n)\*(([^\n]*(\n|$))(\*[^\n]*(\n|$))*)/se",
-                         "'</p><ul><li>'.str_replace(\"\\n*\",'</li><li>','$2').'</li></ul><p>'",
+                         "'</p>\n<ul><li>'.str_replace(\"\\n*\",'</li><li>','$2').'</li></ul>\n<p>'",
                          "'$1 -' . str_replace(\"\\n*\", \"\\n -\", '$2')",
                          "* element1\n* element2\n* element3");
-        // # unordered list
-        MiniWiki::Markup("/(^|\n)#(([^\n]*(\n|$))(#[^\n]*(\n|$))*)/se", "'<ol><li>'.str_replace(\"\\n#\",'</li><li>','$2').'</li></ol>'", "'$0'", "# element1\n# element2\n# element3");
+        // # ordered list
+        MiniWiki::Markup("/(^|\n)#(([^\n]*(\n|$))(#[^\n]*(\n|$))*)/se", "'</p>\n<ol><li>'.str_replace(\"\\n#\",'</li><li>','$2').'</li></ol>\n<p>'", "'$0'", "# element1\n# element2\n# element3");
 
         // bold, italic and others
         // ''' bold '''