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

[platal.git] / modules / register.php

diff --git a/modules/register.php b/modules/register.php
index c53a456..c70a365 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -71,7 +71,7 @@ class RegisterModule extends PLModule
                                    SELECT  m.uid, m.sender, 0
                                      FROM  register_marketing AS m
                                     WHERE  m.hash
-                         ON DUPLICATE KEY  sender = VALUES(sender), success = VALUES(success)',
+                  ON DUPLICATE KEY UPDATE  sender = VALUES(sender), success = VALUES(success)',
                              $subState->s('hash'));
             }
         }
@@ -369,10 +369,10 @@ class RegisterModule extends PLModule
                     $r = XDB::query('SELECT id FROM groups WHERE diminutif = {?}', $yearpromo);
                     if ($r->numRows()) {
                         $asso_id = $r->fetchOneCell();
-                        XDB::execute('INSERT INTO  group_members (uid, asso_id)
-                                           VALUES  ({?}, {?})',
+                        XDB::execute('INSERT IGNORE INTO  group_members (uid, asso_id)
+                                                  VALUES  ({?}, {?})',
                                      $uid, $asso_id);
-                        $mmlist = new MMList($uid, S::v('password'));
+                        $mmlist = new MMList($user);
                         $mmlist->subscribe("promo" . S::v('promo'));
                     }
                     break;