X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fpluser.php;h=746f77b19f825053da4bba305f7b176b5ddf7329;hb=ebde1aef351c87babbc242d8a799073666b3cbe1;hp=6a55a142103740338df1d802fc6293bf50e6328c;hpb=31ac496f284cd21164e05d1472ad1ceca9fe1095;p=platal.git

diff --git a/classes/pluser.php b/classes/pluser.php
index 6a55a14..746f77b 100644
--- a/classes/pluser.php
+++ b/classes/pluser.php
@@ -54,6 +54,9 @@ abstract class PlUser
      * By convention, null means the information hasn't been fetched yet, and
      * false means the information is not available.
      */
+
+    // user_id is internal user ID (potentially numeric), whereas hruid is a
+    // "human readable" unique ID
     protected $user_id = null;
     protected $hruid = null;
 
@@ -66,7 +69,6 @@ abstract class PlUser
     // <display name> !"), while full name is the official full name.
     protected $display_name = null;
     protected $full_name = null;
-    protected $promo = null;
 
     // Other important parameters used when sending emails.
     protected $gender = null;  // Acceptable values are GENDER_MALE and GENDER_FEMALE
@@ -149,11 +151,6 @@ abstract class PlUser
         return $this->full_name;
     }
 
-    public function promo()
-    {
-        return $this->promo;
-    }
-
     abstract public function password();
 
     // Fallback value is GENDER_MALE.
@@ -291,7 +288,7 @@ abstract class PlUser
 
     public static function getSilentWithUID($uid)
     {
-        return User::getWithValues($uid, array('User', '_silent_user_callback'));
+        return User::getWithValues(null, array('user_id' => $uid), array('User', '_silent_user_callback'));
     }
 
     /**