Merge pull request #86 from hinton/3.3/develop

zeelot · zeelot · commit ea9bbe709e9f · 2013-07-29T09:29:53.000-07:00
Refs #4730, Fixed Auth_ORM::logged_in not working if $role is an ORM object.
diff --git a/classes/Kohana/Auth/ORM.php b/classes/Kohana/Auth/ORM.php
@@ -51,6 +51,10 @@ public function logged_in($role = NULL)
 					if ( ! $roles->loaded())
 						return FALSE;
 				}
+				else
+				{
+					$roles = $role;
+				}
 			}
 
 			return $user->has('roles', $roles);

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,10 @@ public function logged_in($role = NULL)`
`51`	`51`	`if ( ! $roles->loaded())`
`52`	`52`	`return FALSE;`
`53`	`53`	`}`
	`54`	`+ else`
	`55`	`+ {`
	`56`	`+ $roles = $role;`
	`57`	`+ }`
`54`	`58`	`}`
`55`	`59`
`56`	`60`	`return $user->has('roles', $roles);`