X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fminiwiki.php;h=d906ad6e12a8170868cfe506d591977406be0bfc;hb=558662bce05a7ffaaadea79514fd8d4cd9f52315;hp=e81d9b70a70f3aa3b3447d53b5063524867a9074;hpb=eaf30d86cc99df2414cf4f171a9b0f11b0561e3b;p=platal.git

diff --git a/classes/miniwiki.php b/classes/miniwiki.php
index e81d9b7..d906ad6 100644
--- a/classes/miniwiki.php
+++ b/classes/miniwiki.php
@@ -73,10 +73,10 @@ class MiniWiki
         // links
         MiniWiki::Markup('/((?:https?|ftp):\/\/(?:[\.\,\;\!\:]*[\w@~%$£µ&i#\-+=_\/\?])*)/ui',
                          '<a href="\\0">\\0</a>', '<\\0>');
-        MiniWiki::Markup('/(\s|^|\\[\\[)www\.((?:[\.\,\;\!\:]*[\w@~%$£µ&i#\-+=_\/\?])*)/iu',
+        MiniWiki::Markup('/(\s|^|\[\[)www\.((?:[\.\,\;\!\:]*[\w@~%$£µ&i#\-+=_\/\?])*)/iu',
                          '\\1<a href="http://www.\\2">www.\\2</a>', '\\1<http://www.\\2>');
         MiniWiki::Markup('/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/i', '<a href="mailto:\\0">\\0</a>', '<\\0>');
-        MiniWiki::Markup('/\\[\\[\\s*<(?:a href=")?([^>]*)(?:">.*<\/a)?>\\s*\|([^\\]]+)\\]\\]/i',
+        MiniWiki::Markup('/\[\[\s*<(?:a href=")?([^">]*?)(?:">.*?<\/a)?>\s*\|([^\]]+)\]\]/i',
                          '<a href="\\1">\\2</a>', '\\2 <\\1>',
                          "[[http://www.example.com|Mon site web]]\n\nhttp://www.example.com\n\ntest@example.com");