X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fuser.php;h=71b21c952cea83a445bb6e4009755e2f7131aa46;hb=9acf22511d818b70dcd4d69bef360916b1050272;hp=d048e5ab4cef1ff75b652fb635be8b335d484cb3;hpb=89cb2025f5f2aed0be3994c89ac473aa11535853;p=platal.git

diff --git a/classes/user.php b/classes/user.php
index d048e5a..71b21c9 100644
--- a/classes/user.php
+++ b/classes/user.php
@@ -24,11 +24,18 @@ class User extends PlUser
     private $_profile_fetched = false;
     private $_profile = null;
 
+    // Additional fields (non core)
+    protected $promo = null;
+
     // Implementation of the login to uid method.
     protected function getLogin($login)
     {
         global $globals;
 
+        if (!$login) {
+            throw new UserNotFoundException();
+        }
+
         if ($login instanceof User) {
             $machin->id();
         }
@@ -479,7 +486,7 @@ class User extends PlUser
     public static function _default_user_callback($login, $results)
     {
         $result_count = count($results);
-        if ($result_count == 0 || !S::has_perms()) {
+        if ($result_count == 0 || !S::admin()) {
             Platal::page()->trigError("Il n'y a pas d'utilisateur avec l'identifiant : $login");
         } else {
             Platal::page()->trigError("Il y a $result_count utilisateurs avec cet identifiant : " . join(', ', $results));