Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

continuing to refactor the validator.

This commit is contained in:
Taylor Otwell 2011-10-16 14:23:52 -05:00
parent 4f560fdf5c
commit fc820e733b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
laravel/validation/validator.php
View File

@ -496,10 +496,9 @@ protected function validate_mimes($attribute, $parameters)
* Get the proper error message for an attribute and rule. * Get the proper error message for an attribute and rule.
* *
* Developer specified attribute specific rules take first priority. * Developer specified attribute specific rules take first priority.
* Developer specified error rules take second priority. * Developer specified error rules take second priority. If the error
* * message has not been specified by the developer, the default will
* If the message has not been specified by the developer, the default * be used from the validation language file.
* will be used from the validation language file.
* *
* @param string $attribute * @param string $attribute
* @param string $rule * @param string $rule
@ -507,14 +506,21 @@ protected function validate_mimes($attribute, $parameters)
*/ */
protected function message($attribute, $rule) protected function message($attribute, $rule)
{ {
// First we'll check for developer specified, attribute specific messages. These messages
// take first priority if they have been specified. They allow the fine-grained tuning
// of error messages for each rule.
if (array_key_exists($attribute.'_'.$rule, $this->messages)) if (array_key_exists($attribute.'_'.$rule, $this->messages))
{ {
return $this->messages[$attribute.'_'.$rule]; return $this->messages[$attribute.'_'.$rule];
} }
// Next we'll check for developer specified, rule specific messages. These allow the
// developer to override the error message for an entire rule, regardless of the
// attribute being validated by that rule.
elseif (array_key_exists($rule, $this->messages)) elseif (array_key_exists($rule, $this->messages))
{ {
return $this->messages[$rule]; return $this->messages[$rule];
} }
// If the
elseif (in_array($rule, $this->size_rules) and ! $this->has_rule($attribute, $this->numeric_rules)) elseif (in_array($rule, $this->size_rules) and ! $this->has_rule($attribute, $this->numeric_rules))
{ {
$line = (array_key_exists($attribute, Input::file())) ? "file" : "string"; $line = (array_key_exists($attribute, Input::file())) ? "file" : "string";