Changeset 3273 for trunk/modules

Timestamp:

08/06/2008 08:12:28 AM (4 months ago)

Author:

Shadowhand

Message:

More optimizations to Auth/ORM

Files:

• trunk/modules/auth/libraries/drivers/Auth/ORM.php (modified) (3 diffs)

trunk/modules/auth/libraries/drivers/Auth/ORM.php

@@ -45 +45 @@
                         {
                                 // Check that the user has the given role
-                                $status = $_SESSION['auth_user']->has('role', $role);
+                                $status = $_SESSION['auth_user']->has(new Role_Model($role));
                         }
                 }
@@ -61 +61 @@
 
                 // If the passwords match, perform a login
-                if ($user->has(ORM::factory('role', 'login')) AND $user->password === $password)
+                if ($user->has(new Role_Model('login')) AND $user->password === $password)
                 {
                         if ($remember === TRUE)
@@ -109 +109 @@
                         $token = ORM::factory('user_token', $token);
 
-                        if ($token->id > 0 AND $token->user->id > 0)
+                        if ($token->loaded AND $token->user->loaded)
                         {
                                 if ($token->user_agent === sha1(Kohana::$user_agent))