Merge branch 'hotfix/fix_markdown' into staging

Conflicts: laravel/documentation/install.md
2012-07-11 22:35:24 +02:00
parent 66f9ea8dba a6c28050e6
commit 79edd529e8
3 changed files with 6 additions and 5 deletions
--- a/laravel/input.php
+++ b/laravel/input.php
@@ -205,7 +205,7 @@ class Input {
 	 */
 	public static function has_file($key)
 	{
-		return ! is_null(static::file("{$key}.tmp_name"));
+		return strlen(static::file("{$key}.tmp_name", "")) > 0;
 	}

 	/**