From 6e83add76f6b7a9d64cc1bfe8473c20a46acbf7f Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 15 Feb 2012 13:17:45 -0600 Subject: [PATCH] tweaking key setting. --- laravel/core.php | 12 ------------ laravel/laravel.php | 4 +--- paths.php | 8 -------- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/laravel/core.php b/laravel/core.php index c4134a77..2c37c458 100644 --- a/laravel/core.php +++ b/laravel/core.php @@ -64,18 +64,6 @@ $_SERVER['LARAVEL_ENV'] = $_SERVER['CLI']['ENV']; } -/** - * Call the bootstrap Closure that was defined in the start.php - * file for the framework. This allows events and more to be - * registered extremely early in the life cycle. - */ -if (isset($bootstrap)) -{ - call_user_func($bootstrap); - - unset($bootstrap); -} - /** * Register all of the core class aliases. These aliases provide a * convenient way of working with the Laravel core classes without diff --git a/laravel/laravel.php b/laravel/laravel.php index 21ece416..438a7b27 100644 --- a/laravel/laravel.php +++ b/laravel/laravel.php @@ -57,9 +57,7 @@ * string for the developer. This provides the developer with * a zero configuration install process. */ -$key = Config::get('application.key'); - -if ($key == '' and Config::get('key.auto')) +if (Config::get('application.key') == '') { ob_start() and with(new CLI\Tasks\Key)->generate(); diff --git a/paths.php b/paths.php index 5de6573d..b18b0671 100644 --- a/paths.php +++ b/paths.php @@ -58,14 +58,6 @@ $paths['public'] = 'public'; } -// -------------------------------------------------------------- -// Define a bootstrap Closure that runs on core load. -// -------------------------------------------------------------- -$bootstrap = function() -{ - Laravel\Config::set('key.auto', true); -}; - // -------------------------------------------------------------- // Define each constant if it hasn't been defined. // --------------------------------------------------------------