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

diff --git a/bin/lists.rpc.py b/bin/lists.rpc.py
index 5dfc534..df5e226 100755 (executable)
--- a/bin/lists.rpc.py
+++ b/bin/lists.rpc.py
@@ -416,7 +416,8 @@ def get_members(userdesc, perms, mlist):
     """
     infos = get_list_info(userdesc, perms, mlist)
     if infos is None:
-        return None
+        # Do not return None, this is not serializable
+        return 0
     details, members = infos
     members.sort()
     members = map(lambda member: (get_name(member), member), members)

diff --git a/modules/payment.php b/modules/payment.php
index 39f8193..079e524 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -250,7 +250,7 @@ class PaymentModule extends PLModule
 
         /* on genere le mail de confirmation */
         $conf_text = str_replace(
-            array('<prenom>', '<nom>', '<promo>', '<montant>', '<salutation>', '<cher>', 'comment>'),
+            array('<prenom>', '<nom>', '<promo>', '<montant>', '<salutation>', '<cher>', '<comment>'),
             array($user->firstName(), $user->lastName(), $user->promo(), $montant,
                   $user->isFemale() ? 'Chère' : 'Cher', $user->isFemale() ? 'Chère' : 'Cher',
                   Env::v('comment')), $conf_text);

diff --git a/modules/register.php b/modules/register.php
index af6b4cc..9c235f9 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -386,8 +386,13 @@ class RegisterModule extends PLModule
                         XDB::execute('INSERT IGNORE INTO  group_members (uid, asso_id)
                                                   VALUES  ({?}, {?})',
                                      $uid, $asso_id);
-                        $mmlist = new MMList($user);
-                        $mmlist->subscribe("promo" . $yearpromo);
+                        try {
+                            $mmlist = new MMList($user);
+                            $mmlist->subscribe("promo" . $yearpromo);
+                        } catch (Exception $e) {
+                            PlErrorReport::report($e);
+                            $page->trigError("L'inscription à la liste promo" . $yearpromo . " a échouée.");
+                        }
                     }
                     break;
                 case 'nl':