Merge branch '3.0/master' into 3.1/develop

kohana · Jan 4, 2011 · ee35422 · ee35422
2 parents fc8781e + 653963a
commit ee35422
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 11 deletions.
diff --git a/classes/kohana/auth.php b/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);
 	}
 
 	/**

diff --git a/guide/auth/config.md b/guide/auth/config.md
diff --git a/guide/auth/edit.md b/guide/auth/edit.md
diff --git a/guide/auth/index.md b/guide/auth/index.md
diff --git a/guide/auth/login.md b/guide/auth/login.md
diff --git a/guide/auth/menu.md b/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)
diff --git a/guide/auth/register.md b/guide/auth/register.md
diff --git a/guide/auth/roles.md b/guide/auth/roles.md
diff --git a/guide/auth/user.md b/guide/auth/user.md