Revert "Initial work on the rewriting of the profile/edit page"

[platal.git] / modules / profile.php

diff --git a/modules/profile.php b/modules/profile.php
index 6b1133f..013199d 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -43,7 +43,7 @@ class ProfileModule extends PLModule
 
             'groupes-x'        => $this->make_hook('xnet',      AUTH_COOKIE),
 
-            'vcard'   => $this->make_hook('vcard',  AUTH_COOKIE),
+            'vcard'   => $this->make_hook('vcard',  AUTH_COOKIE, 'user', NO_HTTPS),
             'admin/binets'     => $this->make_hook('admin_binets', AUTH_MDP, 'admin'),
             'admin/medals'     => $this->make_hook('admin_medals', AUTH_MDP, 'admin'),
             'admin/formations' => $this->make_hook('admin_formations', AUTH_MDP, 'admin'),
@@ -187,8 +187,8 @@ 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']);
-        $title = $user['prenom'] . ' ' . empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'];
+        $user['cv']       = MiniWiki::WikiToHTML($user['cv'], true);
+        $title = $user['prenom'] . ' ' . ( empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'] );
         $page->assign('xorg_title', $title);
 
         // photo
@@ -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));