tweaking key setting.
This commit is contained in:
@@ -64,18 +64,6 @@ if (isset($_SERVER['CLI']['ENV']))
|
||||
$_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
|
||||
|
||||
@@ -57,9 +57,7 @@ ini_set('display_errors', Config::get('error.display'));
|
||||
* 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();
|
||||
|
||||
|
||||
@@ -58,14 +58,6 @@ else
|
||||
$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.
|
||||
// --------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user