Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactoring comments and code.

This commit is contained in:
Taylor Otwell 2011-08-14 13:57:52 -05:00
parent 8798d87e2f
commit 9f1edfaee3
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/auth.php
View File

@ -111,7 +111,7 @@ public static function login($username, $password)
* The user's ID will be stored in the session and the user will be considered * The user's ID will be stored in the session and the user will be considered
* "logged in" on subsequent requests to the application. * "logged in" on subsequent requests to the application.
* *
* Note: The user given to this method should be an object having a "id" property. * Note: The user given to this method should be an object having an "id" property.
* *
* @param object $user * @param object $user
* @return void * @return void

11
system/cache.php
View File

@ -6,6 +6,7 @@ class Cache {
* All of the active cache drivers. * All of the active cache drivers.
* *
* @var Cache\Driver * @var Cache\Driver
* @see driver
*/ */
public static $drivers = array(); public static $drivers = array();
@ -20,10 +21,7 @@ class Cache {
*/ */
public static function driver($driver = null) public static function driver($driver = null)
{ {
if (is_null($driver)) if (is_null($driver)) $driver = Config::get('cache.driver');
{
$driver = Config::get('cache.driver');
}
if ( ! array_key_exists($driver, static::$drivers)) if ( ! array_key_exists($driver, static::$drivers))
{ {
@ -56,11 +54,6 @@ public static function driver($driver = null)
*/ */
public static function get($key, $default = null, $driver = null) public static function get($key, $default = null, $driver = null)
{ {
if (is_null($driver))
{
$driver = Config::get('cache.driver');
}
if (is_null($item = static::driver($driver)->get($key))) if (is_null($item = static::driver($driver)->get($key)))
{ {
return is_callable($default) ? call_user_func($default) : $default; return is_callable($default) ? call_user_func($default) : $default;