Fix wiki in referent profile

Import r1810

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

diff --git a/modules/profile.php b/modules/profile.php
index f2dcaba..ed2a3a6 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -456,7 +456,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));
         $page->assign('bestalias', $bestalias);
         $page->assign('adr_pro', get_user_details_pro($user_id));
 

diff --git a/modules/survey.php b/modules/survey.php
index af8b0b3..ad3b862 100644 (file)
--- a/modules/survey.php
+++ b/modules/survey.php
@@ -318,7 +318,7 @@ class SurveyModule extends PLModule
                 } else { // if no 'survey_id' is in session, we are indeed proposing a new survey
                     if ($survey->proposeSurvey()) { // stores the survey object structure in database
                         $this->show_success($page, "Votre proposition de sondage a bien été enregistrée,
-                                                    elle est en attent de validation par un administrateur du site.", 'survey');
+                                                    elle est en attente de validation par un administrateur du site.", 'survey');
                     } else {
                         $this->show_error($page, '', 'survey');
                     }

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}