Kohana v3.3.2

2014-09-06 23:43:07 +10:00
parent f96694b18f
commit 8888719653
236 changed files with 1685 additions and 996 deletions
--- a/modules/orm/classes/Kohana/Auth/ORM.php
+++ b/modules/orm/classes/Kohana/Auth/ORM.php
@@ -51,6 +51,10 @@ class Kohana_Auth_ORM extends Auth {
 					if ( ! $roles->loaded())
 						return FALSE;
 				}
+				else
+				{
+					$roles = $role;
+				}
 			}

 			return $user->has('roles', $roles);