From 9cd891101b44ab2d2d957fbf4f9dcab7c32fa600 Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Tue, 1 May 2007 22:32:16 +0000 Subject: [PATCH] Use < > as url delimiter git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1791 839d8a87-29fc-0310-9880-83ba4fa771e5 --- classes/miniwiki.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/miniwiki.php b/classes/miniwiki.php index 7e6898e..5af1364 100644 --- a/classes/miniwiki.php +++ b/classes/miniwiki.php @@ -67,10 +67,10 @@ class MiniWiki "'$1$3'", "!titre1\n\n!!titre2\n\n!!!titre3"); // links - MiniWiki::Markup('/((?:https?|ftp):\/\/(?:[\.\,\;\!\:]*[\w@~%$£µ&i#\-+=_\/\?])*)/ui', '\\0', '[\\0]'); - MiniWiki::Markup('/(\s|^|\\[\\[)www\.((?:[\.\,\;\!\:]*[\w@~%$£µ&i#\-+=_\/\?])*)/iu', '\\1www.\\2', '[http://www.\\2]'); - MiniWiki::Markup('/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/i', '\\0', '[mailto:\\0]'); - MiniWiki::Markup('/\\[\\[\\s*.*<\/a>\\s*\|([^\\]]+)\\]\\]/i', '\\2', '\\2 [\\1]', "[[http://www.example.com|Mon site web]]\n\nhttp://www.example.com\n\ntest@example.com"); + MiniWiki::Markup('/((?:https?|ftp):\/\/(?:[\.\,\;\!\:]*[\w@~%$£µ&i#\-+=_\/\?])*)/ui', '\\0', '<\\0>'); + MiniWiki::Markup('/(\s|^|\\[\\[)www\.((?:[\.\,\;\!\:]*[\w@~%$£µ&i#\-+=_\/\?])*)/iu', '\\1www.\\2', ''); + MiniWiki::Markup('/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/i', '\\0', '<\\0>'); + MiniWiki::Markup('/\\[\\[\\s*.*<\/a>\\s*\|([^\\]]+)\\]\\]/i', '\\2', '\\2 <\\1>', "[[http://www.example.com|Mon site web]]\n\nhttp://www.example.com\n\ntest@example.com"); // paragraphs and empty lines MiniWiki::Markup("/\n\n/", '

', "\n\n", "paragraphe1\n\nparagraphe2"); -- 2.1.4