Backport r1811 and r1828

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

diff --git a/modules/profile.php b/modules/profile.php
index 6b1133f..3755368 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -187,7 +187,7 @@ class ProfileModule extends PLModule
         $new   = Env::v('modif') == 'new';
         $user  = get_user_details($login, S::v('uid'), $view);
         $user['freetext'] = MiniWiki::WikiToHTML($user['freetext']);
-        $user['cv']       = MiniWiki::WikiToHTML($user['cv']);
+        $user['cv']       = MiniWiki::WikiToHTML($user['cv'], true);
         $title = $user['prenom'] . ' ' . empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'];
         $page->assign('xorg_title', $title);
 
@@ -475,7 +475,7 @@ class ProfileModule extends PLModule
         $page->assign('prenom', $prenom);
         $page->assign('nom',    $nom);
         $page->assign('promo',  $promo);
-        $page->assign('cv',     $cv);
+        $page->assign('cv',     MiniWiki::WikiToHTML($cv, true));
         $page->assign('bestalias', $bestalias);
         $page->assign('adr_pro', get_user_details_pro($user_id));
 

diff --git a/templates/profile/fiche_referent.tpl b/templates/profile/fiche_referent.tpl
index f365b40..c5bd2c6 100644 (file)
--- a/templates/profile/fiche_referent.tpl
+++ b/templates/profile/fiche_referent.tpl
@@ -73,7 +73,7 @@
 
   {if $cv}
   <h2>Curriculum Vitae : </h2>
-  <div>{$cv|nl2br}</div>
+  <div>{$cv|smarty:nodefaults}</div>
   {/if}