Skip to content

S
syncEnrollments
Commit 130772ca authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Fix bug in size validation when using a string containing all numbers.

parent f4707962
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
system/validator.php
View file @ 130772ca
...@@ -250,7 +250,10 @@ class Validator { ...@@ -250,7 +250,10 @@ class Validator {
*/ */
protected function get_size($attribute) protected function get_size($attribute)
{ {
if (is_numeric($this->attributes[$attribute])) return $this->attributes[$attribute]; if (is_numeric($this->attributes[$attribute]) and $this->has_rule($attribute, array('integer', 'numeric')))
{
return $this->attributes[$attribute];
}
return (array_key_exists($attribute, $_FILES)) ? $this->attributes[$attribute]['size'] / 1024 : Str::length(trim($this->attributes[$attribute])); return (array_key_exists($attribute, $_FILES)) ? $this->attributes[$attribute]['size'] / 1024 : Str::length(trim($this->attributes[$attribute]));
} }
...@@ -420,7 +423,7 @@ class Validator { ...@@ -420,7 +423,7 @@ class Validator {
// For "size" rules that are validating strings or files, we need to adjust // For "size" rules that are validating strings or files, we need to adjust
// the default error message for the appropriate type. // the default error message for the appropriate type.
if (in_array($rule, $this->size_rules) and ! is_numeric($this->attributes[$attribute])) if (in_array($rule, $this->size_rules) and ! $this->has_rule($attribute, array('numeric', 'integer')))
{ {
return (array_key_exists($attribute, $_FILES)) return (array_key_exists($attribute, $_FILES))
? rtrim($message, '.').' '.Lang::line('validation.kilobytes')->get($this->language).'.' ? rtrim($message, '.').' '.Lang::line('validation.kilobytes')->get($this->language).'.'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment