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

some small refactoring and bug fixing.

This commit is contained in:
Taylor Otwell 2011-11-13 15:23:48 -06:00
parent 04f7661292
commit 2758b4c16d
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/auth.php
View File

@ -192,4 +192,4 @@ public static function logout()
IoC::core('session')->forget(Auth::user_key); IoC::core('session')->forget(Auth::user_key);
} }
} }

2
laravel/cookie.php
View File

@ -114,7 +114,7 @@ public static function put($name, $value, $minutes = 0, $path = '/', $domain = n
*/ */
protected static function hash($name, $value) protected static function hash($name, $value)
{ {
return sha1($name.$value.Config::get('application.key')); return sha1($name.$value.Config::$items['application']['key']);
} }
/** /**

2
laravel/form.php
View File

@ -387,7 +387,7 @@ public static function select($name, $options = array(), $selected = null, $attr
*/ */
protected static function option($value, $display, $selected) protected static function option($value, $display, $selected)
{ {
$selected = ($value === $selected) ? 'selected' : null; $selected = ($value == $selected) ? 'selected' : null;
$attributes = array('value' => HTML::entities($value), 'selected' => $selected); $attributes = array('value' => HTML::entities($value), 'selected' => $selected);

4
laravel/laravel.php
View File

@ -177,15 +177,13 @@
*/ */
Routing\Filter::register(require APP_PATH.'filters'.EXT); Routing\Filter::register(require APP_PATH.'filters'.EXT);
list($uri, $method) = array(Request::uri(), Request::method());
$loader = new Routing\Loader(APP_PATH, ROUTE_PATH); $loader = new Routing\Loader(APP_PATH, ROUTE_PATH);
$router = new Routing\Router($loader, CONTROLLER_PATH); $router = new Routing\Router($loader, CONTROLLER_PATH);
IoC::instance('laravel.routing.router', $router); IoC::instance('laravel.routing.router', $router);
Request::$route = $router->route($method, $uri); Request::$route = $router->route(Request::method(), Request::uri());
if ( ! is_null(Request::$route)) if ( ! is_null(Request::$route))
{ {