Merge branch 'master' into staging

9114d2a0 · Taylor Otwell · 36247267 · aa687d03 · 9114d2a0
Commit 9114d2a0 authored May 30, 2012 by Taylor Otwell
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

validator.php laravel/validator.php +1 -1

No files found.
--- a/laravel/validator.php
+++ b/laravel/validator.php
@@ -249,7 +249,7 @@ class Validator {
 		{
 			return false;
 		}
-		elseif ( ! is_null(Input::file($attribute)) and $value['tmp_name'] == '')
+		elseif ( ! is_null(Input::file($attribute)) and is_array($value) and $value['tmp_name'] == '')
 		{
 			return false;
 		}