Merge branch 'fusionax' into account

Conflicts:
	classes/user.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>

diff --git a/classes/user.php b/classes/user.php
index d048e5a..c533bd1 100644 (file)
--- a/classes/user.php
+++ b/classes/user.php
@@ -29,6 +29,10 @@ class User extends PlUser
     {
         global $globals;
 
+        if (!$login) {
+            throw new UserNotFoundException();
+        }
+
         if ($login instanceof User) {
             $machin->id();
         }