From a6641130c4f502420dc20cb7324182a2b56e7fa0 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 15 Nov 2011 19:32:32 -0600 Subject: [PATCH] fixing bugs in validator and file classes. --- laravel/file.php | 5 ++++- laravel/validator.php | 6 ++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/laravel/file.php b/laravel/file.php index 8a4d6f24..afd4bd2e 100644 --- a/laravel/file.php +++ b/laravel/file.php @@ -167,7 +167,10 @@ public static function is($extensions, $path) { $mime = finfo_file(finfo_open(FILEINFO_MIME_TYPE), $path); - if (isset($mimes[$extension]) and in_array((array) $mimes[$extension])) return true; + if (isset($mimes[$extension]) and in_array($mime, (array) $mimes[$extension])) + { + return true; + } } return false; diff --git a/laravel/validator.php b/laravel/validator.php index bf6259f3..57f57688 100644 --- a/laravel/validator.php +++ b/laravel/validator.php @@ -225,9 +225,7 @@ protected function validate_confirmed($attribute, $value) { $confirmed = $attribute.'_confirmation'; - $confirmation = $this->attributes[$confirmed]; - - return array_key_exists($confirmed, $this->attributes) and $value == $confirmation; + return isset($this->attributes[$confirmed]) and $value == $this->attributes[$confirmed]; } /** @@ -241,7 +239,7 @@ protected function validate_confirmed($attribute, $value) */ protected function validate_accepted($attribute, $value) { - return $this->validate_required($attribute) and ($value == 'yes' or $value == '1'); + return $this->validate_required($attribute, $value) and ($value == 'yes' or $value == '1'); } /**