From 96b43e90b37066220b0b3c77e9948c627d5bb11b Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 31 Jan 2012 16:35:35 -0600 Subject: [PATCH] show warning when key is not set. --- application/views/home/index.php | 72 +++++++++++++++++++++----------- laravel/laravel.php | 13 ------ license.txt | 2 +- 3 files changed, 48 insertions(+), 39 deletions(-) diff --git a/application/views/home/index.php b/application/views/home/index.php index 39497146..78da7f87 100644 --- a/application/views/home/index.php +++ b/application/views/home/index.php @@ -69,6 +69,14 @@ padding: 10px; } + #main div.warning { + background-color: #feefb3; + border: 1px solid; + border-radius: 5px; + color: #9f6000; + padding: 10px; + } + #main ul { margin: 10px 0; padding: 0 30px; @@ -81,41 +89,55 @@
-

Welcome To Laravel

+ -

A Framework For Web Artisans

+

Whoops!

-

- You have successfully installed the Laravel framework. Laravel is a simple framework - that helps web artisans create beautiful, creative applications using elegant, expressive - syntax. You'll love using it. -

+
-

Learn the terrain.

+
+ Please set an application key in application/config/application.php! +
-

- You've landed yourself on our default home page. The route that - is generating this page lives at: -

+ - 
APP_PATH/routes.php
+

Welcome To Laravel

-

And the view sitting before you can be found at:

+

A Framework For Web Artisans

- 
APP_PATH/views/home/index.php
+

+ You have successfully installed the Laravel framework. Laravel is a simple framework + that helps web artisans create beautiful, creative applications using elegant, expressive + syntax. You'll love using it. +

-

Create something beautiful.

+

Learn the terrain.

-

- Now that you're up and running, it's time to start creating! - Here are some links to help you get started: -

+

+ You've landed yourself on our default home page. The route that + is generating this page lives at: +

- + 
APP_PATH/routes.php
+ +

And the view sitting before you can be found at:

+ + 
APP_PATH/views/home/index.php
+ +

Create something beautiful.

+ +

+ Now that you're up and running, it's time to start creating! + Here are some links to help you get started: +

+ + + +
diff --git a/laravel/laravel.php b/laravel/laravel.php index ec06e803..0d9253a1 100644 --- a/laravel/laravel.php +++ b/laravel/laravel.php @@ -7,19 +7,6 @@ */ require 'core.php'; -/** - * Verify that an application key has been set in the configuration. - * The key is used to do proper signature hashing on cookies, as - * well as keep various other parts of the framework secure, so - * it is a required configuration option. - */ -if (Config::$items['application']['application']['key'] == '') -{ - $path = 'application/config/application.php'; - - die("Please set an application key in {$path}."); -} - /** * Register the default timezone for the application. This will be the * default timezone used by all date / timezone functions throughout diff --git a/license.txt b/license.txt index f4719c6a..1ec1c084 100644 --- a/license.txt +++ b/license.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) <2011> +Copyright (c) <2012> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in