set application key by default.

jbeduya · Feb 22, 2012 · 86fa595 · 86fa595
1 parent 257d917
commit 86fa595
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 21 deletions.
diff --git a/application/config/application.php b/application/config/application.php
@@ -44,9 +44,7 @@
 	|
 	*/
 
-	'key' => '',
-
-	'auto_key' => true,
+	'key' => 'YourSecretKeyGoesHere!',
 
 	/*
 	|--------------------------------------------------------------------------

diff --git a/artisan b/artisan
@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.0.0
+ * @version  3.0.1
  * @author   Taylor Otwell <[email protected]>
  * @link     http://laravel.com
  */

diff --git a/laravel/laravel.php b/laravel/laravel.php
@@ -52,21 +52,6 @@
 
 ini_set('display_errors', Config::get('error.display'));
 
-/**
- * Determine if we need to set the application key to a very random
- * string so we can provide a zero configuration installation but
- * still ensure that the key is set to something random. It is
- * possible to disable this feature.
- */
-$auto_key = Config::get('application.auto_key');
-
-if ($auto_key and Config::get('application.key') == '')
-{
-	ob_start() and with(new CLI\Tasks\Key)->generate();
-
-	ob_end_clean();
-}
-
 /**
  * Even though "Magic Quotes" are deprecated in PHP 5.3, they may
  * still be enabled on the server. To account for this, we will

diff --git a/paths.php b/paths.php
@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.0.0
+ * @version  3.0.1
  * @author   Taylor Otwell <[email protected]>
  * @link     http://laravel.com
  */

diff --git a/public/index.php b/public/index.php
@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.0.0
+ * @version  3.0.1
  * @author   Taylor Otwell <[email protected]>
  * @link     http://laravel.com
  */