** // __ do not break url catcher anymore

git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@81 9869982d-c50d-0410-be91-f2a2ec7c7c7b

diff --git a/banana/misc.inc.php b/banana/misc.inc.php
index 7a782c4..6fb384c 100644 (file)
--- a/banana/misc.inc.php
+++ b/banana/misc.inc.php
@@ -493,8 +493,13 @@ function formatbody($_text, $format='plain', $flowed=false)
         $formatting = Array('\*' => 'strong',
                             '_' => 'u',
                             '/' => 'em');
+        $word    = '-a-z0-9\'âäàãéêëêïîìöôòõüûùÿ';
         foreach ($formatting as $limit=>$mark) {
-            $res = preg_replace('@' . $limit . '([^\s]+)' . $limit . '@', "<$mark>\\1</$mark>", $res);
+            $res = preg_replace('@([^' . $word . '])'
+                                . $limit . '([' . $word . ']+)' . $limit 
+                                . '([^' . $word  . '])@i'
+                                ,'\1<' . $mark . '>\2</' . $mark . '>\3'
+                                , $res);
         }
     }