Merge branch 'master' into staging

This commit is contained in:
Taylor Otwell 2012-05-30 08:28:58 -05:00
commit 9114d2a033
1 changed files with 1 additions and 1 deletions

View File

@ -249,7 +249,7 @@ protected function validate_required($attribute, $value)
{ {
return false; 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; return false;
} }