Merge commit 'origin/fusionax' into account

[platal.git] / modules / axletter.php

diff --git a/modules/axletter.php b/modules/axletter.php
index 805f238..5bc7643 100644 (file)
--- a/modules/axletter.php
+++ b/modules/axletter.php
@@ -270,15 +270,14 @@ class AXLetterModule extends PLModule
 
         try {
             $nl = new AXLetter($nid);
+            $user =& S::user();
             if (Get::has('text')) {
-                $nl->toText($page, S::v('prenom'), S::v('nom'), S::v('femme'));
+                $nl->toText($page, $user);
             } else {
-                $nl->toHtml($page, S::v('prenom'), S::v('nom'), S::v('femme'));
+                $nl->toHtml($page, $user);
             }
             if (Post::has('send')) {
-                $nl->sendTo(S::user()->login(), S::user()->bestEmail(),
-                            S::v('prenom'), S::v('nom'),
-                            S::v('femme'), S::v('mail_fmt') != 'texte');
+                $nl->sendTo($user);
             }
         } catch (MailNotFound $e) {
             return PL_NOT_FOUND;