From 55a201ac6170cba61ede7a2dbd616416c95a94a5 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sat, 16 Jul 2011 13:48:38 -0500 Subject: [PATCH 1/2] fixed bug in route finder when looking for routes in route directory. --- system/route/finder.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/system/route/finder.php b/system/route/finder.php index f04c1d0c..3900e11b 100644 --- a/system/route/finder.php +++ b/system/route/finder.php @@ -29,7 +29,12 @@ public static function find($name) // to all of the routes, not just the ones applicable to the request URI. if (is_null(static::$routes)) { - static::$routes = (is_dir(APP_PATH.'routes')) ? static::load() : require APP_PATH.'routes'.EXT; + static::$routes = require APP_PATH.'routes'.EXT; + + if (is_dir(APP_PATH.'routes')) + { + static::$routes = array_merge(static::load(), static::$routes); + } } if (array_key_exists($name, static::$names)) From 3dfc8d4aaa9ed123c963eece54fc5d20d7cee5db Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sat, 16 Jul 2011 13:49:33 -0500 Subject: [PATCH 2/2] fixed routing issue. --- public/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.php b/public/index.php index 2e87683e..de7ebcf1 100644 --- a/public/index.php +++ b/public/index.php @@ -4,7 +4,7 @@ * * @package Laravel * @version 1.2.1 - * @author Taylor Otwell + * @author Taylor Otwell1 * @license MIT License * @link http://laravel.com */