X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=classes%2Fuser.php;h=b5669fa4934e9483ae25bb21fb0d7a5e1dc9da3a;hb=190efb3a08127072aa3e0876a79e7bf76aa77051;hp=4d4a28aedba438315a95f9cc546af6b4cfab32d8;hpb=20b087ff2e4bb918f601a9bcc2c67d1fbc5b2231;p=platal.git

diff --git a/classes/user.php b/classes/user.php
index 4d4a28a..b5669fa 100644
--- a/classes/user.php
+++ b/classes/user.php
@@ -172,6 +172,7 @@ class User extends PlUser
             $joins .= XDB::format("LEFT JOIN group_members AS gpm ON (gpm.uid = a.uid AND gpm.asso_id = {?})\n", $globals->asso('id'));
             $fields[] = 'gpm.perms AS group_perms';
             $fields[] = 'gpm.comm AS group_comm';
+            $fields[] = 'gpm.position AS group_position';
         }
         if (count($fields) > 0) {
             $fields = ', ' . implode(', ', $fields);
@@ -327,11 +328,11 @@ class User extends PlUser
 
     /** Return the main profile attached with this account if any.
      */
-    public function profile($forceFetch = false)
+    public function profile($forceFetch = false, $fields = 0x0000, $visibility = null)
     {
         if (!$this->_profile_fetched || $forceFetch) {
             $this->_profile_fetched = true;
-            $this->_profile = Profile::get($this);
+            $this->_profile = Profile::get($this, $fields, $visibility);
         }
         return $this->_profile;
     }
@@ -690,7 +691,7 @@ class User extends PlUser
                             'forum_innd', 'forum_profiles', 'forum_subs',
                             'group_announces_read', 'group_members',
                             'group_member_sub_requests', 'reminder', 'requests',
-                            'requests_hidden');
+                            'requests_hidden', 'aliases');
             foreach ($tables as $t) {
                 XDB::execute('DELETE FROM  ' . $t . '
                                     WHERE  uid = {?}',
@@ -728,7 +729,7 @@ class User extends PlUser
             }
         }
 
-        $mmlist = new MMList($this);
+        $mmlist = new MMList(S::user());
         $mmlist->kill($this->hruid, $clearAll);
     }
 
@@ -813,7 +814,7 @@ class User extends PlUser
         XDB::execute('UPDATE  log_last_sessions
                          SET  id = {?}
                        WHERE  uid = {?}',
-                     $newuser->id());
+                     $lastSession, $newuser->id());
         XDB::execute('DELETE FROM  accounts
                             WHERE  uid = {?}',
                      $this->id());