From 51575f3f9d2c85ec25e63ebebc57b9fdf307619a Mon Sep 17 00:00:00 2001 From: Juan Antonio Tubio Date: Tue, 18 Jul 2017 16:18:00 +0200 Subject: [PATCH] Don't add {field} to message uf already exists Fixed rule() function to don't add {field} to message if already exists on them --- src/Valitron/Validator.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Valitron/Validator.php b/src/Valitron/Validator.php index ef5b1d7..fad587b 100644 --- a/src/Valitron/Validator.php +++ b/src/Valitron/Validator.php @@ -1132,11 +1132,16 @@ class Validator $msgs = $this->getRuleMessages(); $message = isset($msgs[$rule]) ? $msgs[$rule] : self::ERROR_DEFAULT; + // Ensure message contains field label + if (mb_strpos($message, '{field}') === false) { + $message = '{field} ' . $message; + } + $this->_validations[] = array( 'rule' => $rule, 'fields' => (array) $fields, 'params' => (array) $params, - 'message' => '{field} ' . $message + 'message' => $message ); return $this;