Closes #674: MiniWiki xhtml validation

 ChangeLog            |    1 +
 classes/miniwiki.php |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1855 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index 8c6906b..3944afd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ New:
 Bug/Wish:
 
     * Core:
+        - #674: MiniWiki xhtml validation                                  -FRU
         - #678: PlUpload filename detection                                -FRU
 
     * Profile:

diff --git a/classes/miniwiki.php b/classes/miniwiki.php
index 70f5d3d..49abc2b 100644 (file)
--- a/classes/miniwiki.php
+++ b/classes/miniwiki.php
@@ -33,7 +33,10 @@ class MiniWiki
         MiniWiki::Markup("/\\\\(?".">(\\\\*))\n/e", "str_repeat('<br />\n',mb_strlen('$1'))", "str_repeat('\n',mb_strlen('$1'))", "ligne1\\\\\nligne2");
         
         // * unordered list 
-        MiniWiki::Markup("/(^|\n)\*(([^\n]*(\n|$))(\*[^\n]*(\n|$))*)/se", "'<ul><li>'.str_replace(\"\\n*\",'</li><li>','$2').'</li></ul>'", "'$0'", "* element1\n* element2\n* element3"); 
+        MiniWiki::Markup("/(^|\n)\*(([^\n]*(\n|$))(\*[^\n]*(\n|$))*)/se",
+                         "'</p><ul><li>'.str_replace(\"\\n*\",'</li><li>','$2').'</li></ul><p>'",
+                         "'$0'",
+                         "* 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"); 
         
@@ -75,7 +78,7 @@ class MiniWiki
         // paragraphs and empty lines
         MiniWiki::Markup("/\n\n/", '</p><p>', "\n\n", "paragraphe1\n\nparagraphe2");
         MiniWiki::Markup("/\n/", ' ', "\n");
-        MiniWiki::Markup("/^.*<\/p><p>.*$/s", "<p>$0</p>", "$0");
+        MiniWiki::Markup("/^.*<\/p>.*<p>.*$/s", "<p>$0</p>", "$0");
     }
 
     public static function WikiToHTML($wiki, $title = false)