miniwiki syntax for freetext comment

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

diff --git a/modules/profile.php b/modules/profile.php
index 88e850f..c80edf7 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -205,8 +205,7 @@ class ProfileModule extends PLModule
 
         $new   = Env::v('modif') == 'new';
         $user  = get_user_details($login, S::v('uid'), $view);
-        require_once('url_catcher.inc.php');
-        $user['freetext'] = url_catcher($user['freetext'], false);
+        $user['freetext'] = MiniWiki::WikiToHTML($user['freetext']);
         $title = $user['prenom'] . ' ' . empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'];
         $page->assign('xorg_title', $title);
 

diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl
index 5a50d5a..8b6b737 100644 (file)
--- a/templates/profile/general.tpl
+++ b/templates/profile/general.tpl
@@ -343,10 +343,16 @@
     <tr>
       <td class="dcolg">
         <span class="titre">Complément libre</span>
-        <span class="comm">Commentaire? ICQ? etc...</span>
+        <span class="comm">Commentaire ? ICQ ? etc...</span>
       </td>
       <td class="dcold">
         <textarea name="freetext" rows="3" cols="29" >{$freetext}</textarea>
+        <br/>
+        <span class="smaller">
+          <a href="wiki_help/notitle" class="popup3">
+            {icon name=information title="Syntaxe wiki"} Voir la syntaxe wiki autorisée pour le commentaire
+          </a>
+        </span>
       </td>
     </tr>
   </table>