From 4283e7ec98ae0fcfccfb84d76081adb019092cec Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sun, 20 Nov 2011 23:01:05 -0600 Subject: [PATCH] moved error pages to application directory. --- {laravel => application}/views/error/404.php | 0 {laravel => application}/views/error/500.php | 0 laravel/bootstrap/core.php | 1 - laravel/view.php | 9 --------- 4 files changed, 10 deletions(-) rename {laravel => application}/views/error/404.php (100%) rename {laravel => application}/views/error/500.php (100%) diff --git a/laravel/views/error/404.php b/application/views/error/404.php similarity index 100% rename from laravel/views/error/404.php rename to application/views/error/404.php diff --git a/laravel/views/error/500.php b/application/views/error/500.php similarity index 100% rename from laravel/views/error/500.php rename to application/views/error/500.php diff --git a/laravel/bootstrap/core.php b/laravel/bootstrap/core.php index 8442839d..cb5201a2 100644 --- a/laravel/bootstrap/core.php +++ b/laravel/bootstrap/core.php @@ -20,7 +20,6 @@ define('ROUTE_PATH', APP_PATH.'routes/'); define('SESSION_PATH', STORAGE_PATH.'sessions/'); define('SYS_CONFIG_PATH', SYS_PATH.'config/'); -define('SYS_VIEW_PATH', SYS_PATH.'views/'); define('VIEW_PATH', APP_PATH.'views/'); /** diff --git a/laravel/view.php b/laravel/view.php index a8ffd915..5a3f7b52 100644 --- a/laravel/view.php +++ b/laravel/view.php @@ -70,21 +70,12 @@ protected function path($view) { $view = str_replace('.', '/', $view); - // Application views take priority over system views, so we will return the - // application version of the view if both exists. Also, we need to check - // for Blade views using the Blade extension. The Blade extension gives - // an easy method of determining if the view should be compiled using - // the Blade compiler or if the view is plain PHP. foreach (array(EXT, BLADE_EXT) as $extension) { if (file_exists($path = VIEW_PATH.$view.$extension)) { return $path; } - elseif (file_exists($path = SYS_VIEW_PATH.$view.$extension)) - { - return $path; - } } throw new \RuntimeException("View [$view] does not exist.");