LiittleCookie/valitron
1
0
Fork 0
mirror of https://github.com/vlucas/valitron.git synced 2025-12-31 07:01:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #210 from jatubio/patch-1

Browse Source 
Don't prepend field name to error message when {field} is already set in the message
This commit is contained in:
Willem Wollebrants 2017-08-27 13:16:37 +02:00 committed by GitHub
commit f49917ecfd
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Valitron/Validator.php
View File

@ -1132,11 +1132,21 @@ class Validator
$msgs = $this->getRuleMessages(); $msgs = $this->getRuleMessages();
$message = isset($msgs[$rule]) ? $msgs[$rule] : self::ERROR_DEFAULT; $message = isset($msgs[$rule]) ? $msgs[$rule] : self::ERROR_DEFAULT;
// Ensure message contains field label
if (function_exists('mb_strpos')) {
$notContains = mb_strpos($message, '{field}') === false;
} else {
$notContains = strpos($message, '{field}') === false;
}
if ($notContains) {
$message = '{field} ' . $message;
}
$this->_validations[] = array( $this->_validations[] = array(
'rule' => $rule, 'rule' => $rule,
'fields' => (array) $fields, 'fields' => (array) $fields,
'params' => (array) $params, 'params' => (array) $params,
'message' => '{field} ' . $message 'message' => $message
); );
return $this; return $this;