From f05148503e95a77feff5e7ff7f3a1b5e82dfc97f Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 4 Jul 2012 22:56:58 +0300 Subject: [PATCH 1/7] Input::has_file was not working properly. This one should work perfect :) --- laravel/input.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/input.php b/laravel/input.php index 6a28b17f..0de7b759 100644 --- a/laravel/input.php +++ b/laravel/input.php @@ -205,7 +205,7 @@ public static function file($key = null, $default = null) */ public static function has_file($key) { - return ! is_null(static::file("{$key}.tmp_name")); + return strlen(static::file("{$key}.tmp_name", "")) > 0; } /** From d7bbdd97358bc5a2a3b837f366c5fc01e749836b Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Thu, 5 Jul 2012 01:52:30 +0300 Subject: [PATCH 2/7] Fix anchor name for "Retrieving a language line" section on localization page. --- laravel/documentation/localization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/documentation/localization.md b/laravel/documentation/localization.md index e1941633..c928a49c 100644 --- a/laravel/documentation/localization.md +++ b/laravel/documentation/localization.md @@ -33,7 +33,7 @@ #### Creating a language file: Nice! Now you know how to get started setting up your language files and directories. Let's keep localizing! - + ## Retrieving A Language Line #### Retrieving a language line: From 82ababb4cb8e123c6b2e5e767119390364c867cd Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 9 Jul 2012 09:54:56 -0500 Subject: [PATCH 3/7] Add note about making view directory writable. --- laravel/documentation/install.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/laravel/documentation/install.md b/laravel/documentation/install.md index b3312366..941699ee 100644 --- a/laravel/documentation/install.md +++ b/laravel/documentation/install.md @@ -23,7 +23,8 @@ ## Installation 1. [Download Laravel](http://laravel.com/download) 2. Extract the Laravel archive and upload the contents to your web server. 3. Set the value of the **key** option in the **config/application.php** file to a random, 32 character string. -4. Navigate to your application in a web browser. +4. Verify that the `storage/views` directory is writable. +5. Navigate to your application in a web browser. If all is well, you should see a pretty Laravel splash page. Get ready, there is lots more to learn! From a66eb44809c76c3cae3934a81c6c51ff73035e8f Mon Sep 17 00:00:00 2001 From: Shawn McCool Date: Wed, 11 Jul 2012 22:28:44 +0200 Subject: [PATCH 4/7] fixed typo --- laravel/documentation/install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/documentation/install.md b/laravel/documentation/install.md index 7a1f68dc..a3e9bd8e 100644 --- a/laravel/documentation/install.md +++ b/laravel/documentation/install.md @@ -45,7 +45,7 @@ ### Problems? - Make sure the **public** directory is the document root of your web server. (see: Server Configuration below) - If you are using mod_rewrite, set the **index** option in **application/config/application.php** to an empty string. -- Verify that your storage folder and the folders within in are writable by your web server. +- Verify that your storage folder and the folders within are writable by your web server. ## Server Configuration From ee6adc26d9e651297833fa9a22a678793105de33 Mon Sep 17 00:00:00 2001 From: Shawn McCool Date: Wed, 11 Jul 2012 22:30:38 +0200 Subject: [PATCH 5/7] fix merge --- laravel/documentation/install.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/laravel/documentation/install.md b/laravel/documentation/install.md index a3e9bd8e..ae3984dd 100644 --- a/laravel/documentation/install.md +++ b/laravel/documentation/install.md @@ -4,11 +4,7 @@ ## Contents - [Requirements](#requirements) - [Installation](#installation) -<<<<<<< HEAD -- [Server Configuration: Why Public?](#server-configuration) -======= - [Server Configuration](#server-configuration) ->>>>>>> feature/docs-install - [Basic Configuration](#basic-configuration) - [Environments](#environments) - [Cleaner URLs](#cleaner-urls) From 85ec19367d034622f74683049db365fcf5d7113f Mon Sep 17 00:00:00 2001 From: Shawn McCool Date: Wed, 11 Jul 2012 22:31:46 +0200 Subject: [PATCH 6/7] fix merge --- laravel/documentation/install.md | 1 - 1 file changed, 1 deletion(-) diff --git a/laravel/documentation/install.md b/laravel/documentation/install.md index ae3984dd..07cfbb4f 100644 --- a/laravel/documentation/install.md +++ b/laravel/documentation/install.md @@ -60,7 +60,6 @@ ## Server Configuration Notice that while we installed to **/Users/JonSnow/Sites/MySite** our DocumentRoot points to /Users/JonSnow/Sites/MySite/public**. While pointing the DocumentRoot to the public folder is a commonly used best-practice, it's possible that you may need to use Laravel on a host that does not allow you to update your DocumentRoot. A collection of algorithms to circumvent this need can be found [http://forums.laravel.com/viewtopic.php?id=1258](on the Laravel forums.) ->>>>>>> feature/docs-install ## Basic Configuration From a6c28050e68f0b824db608aa490c89652032ae15 Mon Sep 17 00:00:00 2001 From: Shawn McCool Date: Wed, 11 Jul 2012 22:34:38 +0200 Subject: [PATCH 7/7] style updates --- laravel/documentation/install.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/laravel/documentation/install.md b/laravel/documentation/install.md index 07cfbb4f..1e051e06 100644 --- a/laravel/documentation/install.md +++ b/laravel/documentation/install.md @@ -57,9 +57,9 @@ ## Server Configuration ServerName mysite.dev -Notice that while we installed to **/Users/JonSnow/Sites/MySite** our DocumentRoot points to /Users/JonSnow/Sites/MySite/public**. +Notice that while we installed to **/Users/JonSnow/Sites/MySite** our DocumentRoot points to **/Users/JonSnow/Sites/MySite/public**. -While pointing the DocumentRoot to the public folder is a commonly used best-practice, it's possible that you may need to use Laravel on a host that does not allow you to update your DocumentRoot. A collection of algorithms to circumvent this need can be found [http://forums.laravel.com/viewtopic.php?id=1258](on the Laravel forums.) +While pointing the DocumentRoot to the public folder is a commonly used best-practice, it's possible that you may need to use Laravel on a host that does not allow you to update your DocumentRoot. A collection of algorithms to circumvent this need can be found [on the Laravel forums.](http://forums.laravel.com/viewtopic.php?id=1258) ## Basic Configuration