From: Stéphane Jacob <sj@m4x.org>
Date: Tue, 28 Jun 2011 20:49:50 +0000 (+0200)
Subject: Fixes users merge.
X-Git-Tag: xorg/1.1.3~2^2~13
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=f7d43ed53508bacc955e4964af2b4071ac906c6d;p=platal.git

Fixes users merge.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/classes/user.php b/classes/user.php
index 7ede56b..f24a8dc 100644
--- a/classes/user.php
+++ b/classes/user.php
@@ -782,6 +782,8 @@ class User extends PlUser
 
             // Change email used in mailing lists.
             if ($this->forlifeEmail() != $newuser->forlifeEmail()) {
+                // The super user is the user who has the right to do the modification.
+                $super_user = S::user();
                 // group mailing lists
                 $group_domains = XDB::fetchColumn('SELECT  g.mail_domain
                                                      FROM  groups        AS g
@@ -789,11 +791,11 @@ class User extends PlUser
                                                     WHERE  g.mail_domain != \'\' AND gm.uid = {?}',
                                                   $this->id());
                 foreach ($group_domains as $mail_domain) {
-                    $mmlist = new MMList($this, $mail_domain);
+                    $mmlist = new MMList($super_user, $mail_domain);
                     $mmlist->replace_email_in_all($this->forlifeEmail(), $newuser->forlifeEmail());
                 }
                 // main domain lists
-                $mmlist = new MMList($this);
+                $mmlist = new MMList($super_user);
                 $mmlist->replace_email_in_all($this->forlifeEmail(), $newuser->forlifeEmail());
             }
         }