From: Stéphane Jacob <sj@m4x.org>
Date: Mon, 20 Jul 2009 20:56:15 +0000 (+0200)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~313^2~7
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=43b816c7ed20f3b1dbb5c8b6971d8582016a7a86;hp=429e4a4b8eb428e9631513fc6bb053b4635c7729;p=platal.git

Merge commit 'origin/master' into fusionax
---

diff --git a/include/reminder/ml.inc.php b/include/reminder/ml.inc.php
index 9732bb2..fa45b0b 100644
--- a/include/reminder/ml.inc.php
+++ b/include/reminder/ml.inc.php
@@ -36,11 +36,10 @@ class ReminderMl extends Reminder
                                 S::i('uid'));
             while (list($sub, $domain) = $res->next()) {
                 if (array_shift($subs) == "$sub@$domain") {
-                    list($sub, $domain) = explode('@', $list);
                     if ($domain != $current_domain) {
                         $current_domain = $domain;
-                        $client = new MMList(S::v('uid'), S::v('password'), $domain);
                     }
+                    $client = new MMList(S::v('uid'), S::v('password'), $domain);
                     $client->subscribe($sub);
                 }
             }
diff --git a/templates/reminder/ml.tpl b/templates/reminder/ml.tpl
index 8a26ada..62270ae 100644
--- a/templates/reminder/ml.tpl
+++ b/templates/reminder/ml.tpl
@@ -28,7 +28,7 @@
     <dt>
       <label>
         <input type='checkbox' value='1' checked="checked" name="sub_ml[{$list}]" />
-        {$list}*&nbsp;: {$details.desc}
+        {$list}&nbsp;: {$details.desc}
       </label>
     </dt>
     {if $details.info}