Commit 6e83add7 by Taylor Otwell

tweaking key setting.

parent 82315f31
...@@ -65,18 +65,6 @@ if (isset($_SERVER['CLI']['ENV'])) ...@@ -65,18 +65,6 @@ if (isset($_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 * Register all of the core class aliases. These aliases provide a
* convenient way of working with the Laravel core classes without * convenient way of working with the Laravel core classes without
* having to worry about the namespacing. The developer is also * having to worry about the namespacing. The developer is also
......
...@@ -57,9 +57,7 @@ ini_set('display_errors', Config::get('error.display')); ...@@ -57,9 +57,7 @@ ini_set('display_errors', Config::get('error.display'));
* string for the developer. This provides the developer with * string for the developer. This provides the developer with
* a zero configuration install process. * a zero configuration install process.
*/ */
$key = Config::get('application.key'); if (Config::get('application.key') == '')
if ($key == '' and Config::get('key.auto'))
{ {
ob_start() and with(new CLI\Tasks\Key)->generate(); ob_start() and with(new CLI\Tasks\Key)->generate();
......
...@@ -59,14 +59,6 @@ else ...@@ -59,14 +59,6 @@ else
} }
// -------------------------------------------------------------- // --------------------------------------------------------------
// 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. // Define each constant if it hasn't been defined.
// -------------------------------------------------------------- // --------------------------------------------------------------
foreach ($paths as $name => $path) foreach ($paths as $name => $path)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment