Browse files

Merge branch '3.0/master' into 3.1/develop

  • Loading branch information...
2 parents fc8781e + 653963a commit ee35422db1c17391aaedb59ccc1843adb564fbc5 @isaiahdw isaiahdw committed Jan 4, 2011
View
12 classes/kohana/auth.php
@@ -40,16 +40,6 @@ public static function instance()
return Auth::$_instance;
}
- /**
- * Create an instance of Auth.
- *
- * @return Auth
- */
- public static function factory($config = array())
- {
- return new Auth($config);
- }
-
protected $_session;
protected $_config;
@@ -142,7 +132,7 @@ public function logout($destroy = FALSE, $logout_all = FALSE)
*/
public function logged_in($role = NULL)
{
- return FALSE !== $this->get_user();
+ return ($this->get_user() !== FALSE);
}
/**
View
0 guide/auth/config.md
No changes.
View
0 guide/auth/edit.md
No changes.
View
0 guide/auth/index.md
No changes.
View
0 guide/auth/login.md
No changes.
View
7 guide/auth/menu.md
@@ -0,0 +1,7 @@
+## [Auth]()
+- [Config](config)
+- [User Model](user)
+- [Register Users](register)
+- [Log in and out](login)
+- [Edit User](edit)
+- [Using Roles](roles)
View
0 guide/auth/register.md
No changes.
View
0 guide/auth/roles.md
No changes.
View
0 guide/auth/user.md
No changes.

0 comments on commit ee35422

Please sign in to comment.