Merge remote branch 'origin/xorg/maint' into xorg/master

[platal.git] / include / reminder / ax_letter.inc.php

diff --git a/include/reminder/ax_letter.inc.php b/include/reminder/ax_letter.inc.php
index 228dc30..29c1330 100644 (file)
--- a/include/reminder/ax_letter.inc.php
+++ b/include/reminder/ax_letter.inc.php
@@ -24,8 +24,8 @@ class ReminderAxLetter extends Reminder
     public function HandleAction($action)
     {
         if ($action == 'yes') {
-            Platal::load('axletter', 'axletter.inc.php');
-            AXLetter::subscribe();
+            require_once 'newsletter.inc.php';
+            NewsLetter::forGroup(NewsLetter::GROUP_AX)->subscribe();
             $this->UpdateOnYes();
         }
 
@@ -52,10 +52,10 @@ class ReminderAxLetter extends Reminder
         return 'Xorg/MailsAX';
     }
 
-    public static function IsCandidate(User &$user, $candidate)
+    public static function IsCandidate(User $user, $candidate)
     {
-        Platal::load('axletter', 'axletter.inc.php');
-        $isSubscribed = AXLetter::subscriptionState();
+        require_once 'newsletter.inc.php';
+        $isSubscribed = NewsLetter::forGroup(NewsLetter::GROUP_AX)->subscriptionState();
         if ($isSubscribed) {
             Reminder::MarkCandidateAsAccepted($user->id(), $candidate);
         }