Merge branch 'master' into staging

This commit is contained in:
Taylor Otwell 2012-05-30 08:28:58 -05:00
commit 9114d2a033

View File

@ -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;
}