From 7373df1ef02775172149f6a16c4c94fccd3a1ab8 Mon Sep 17 00:00:00 2001
From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Mon, 30 Apr 2007 13:42:55 +0000
Subject: [PATCH] Backport

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1780 839d8a87-29fc-0310-9880-83ba4fa771e5
---
 classes/miniwiki.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/classes/miniwiki.php b/classes/miniwiki.php
index 43a2281..7e6898e 100644
--- a/classes/miniwiki.php
+++ b/classes/miniwiki.php
@@ -33,9 +33,9 @@ class MiniWiki
         MiniWiki::Markup("/\\\\(?".">(\\\\*))\n/e", "str_repeat('<br />\n',strlen('$1'))", "str_repeat('\n',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", "'<ul><li>'.str_replace(\"\\n*\",'</li><li>','$2').'</li></ul>'", "'$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"); 
+        MiniWiki::Markup("/(^|\n)#(([^\n]*(\n|$))(#[^\n]*(\n|$))*)/se", "'<ol><li>'.str_replace(\"\\n#\",'</li><li>','$2').'</li></ol>'", "'$0'", "# element1\n# element2\n# element3"); 
         
         // bold, italic and others
         // ''' bold '''
@@ -144,6 +144,11 @@ class MiniWiki
             $oldrule12 = MiniWiki::$replacementHTML[MiniWiki::$title_index];
             MiniWiki::$replacementHTML[MiniWiki::$title_index] = "'$0'";
         }
+        //$text = trim($wiki);
+        //foreach (MiniWiki::$patternsWiki as $key=>$pattern) {
+        //    echo $key . " -  " . $pattern . "\n";
+        //    $text = preg_replace($pattern, MiniWiki::$replacementText[$key], $text);
+        //}
         $text = preg_replace(MiniWiki::$patternsWiki, MiniWiki::$replacementText, trim($wiki));
         if (!$title) {
             MiniWiki::$replacementHTML[MiniWiki::$title_index] = $oldrule12;
-- 
2.1.4