From 4e131c2c508a74390ee93dc5e9480cbe21e3b6d9 Mon Sep 17 00:00:00 2001 From: secretr Date: Tue, 3 Apr 2012 14:37:48 +0000 Subject: [PATCH] refined validator message building --- e107_handlers/model_class.php | 2 +- e107_handlers/validator_class.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e107_handlers/model_class.php b/e107_handlers/model_class.php index b6761ea56..e6c123642 100644 --- a/e107_handlers/model_class.php +++ b/e107_handlers/model_class.php @@ -2225,7 +2225,7 @@ class e_front_model extends e_model * @param integer $error_code [optional] * @return object */ - public function addValidationError($message, $field_title = '', $error_code = '') + public function addValidationError($message, $field_title = '', $error_code = 0) { $this->getValidator()->addValidateMessage($field_title, $error_code, $message)->setIsValidData(false); return $this; diff --git a/e107_handlers/validator_class.php b/e107_handlers/validator_class.php index f9ce9ba03..7e833db23 100644 --- a/e107_handlers/validator_class.php +++ b/e107_handlers/validator_class.php @@ -776,8 +776,8 @@ class e_validator $dbgmsg = false; if($err_message) { - $lan = (strpos($err_message, '%1$s') !== false ? '' : '"%1$s" - ').$err_message; // custom, e.g. // default '"%1$s" field error: Custom error message. ' - $dbgmsg = LAN_VALIDATE_FAILMSG; + $lan = (!$field_title || strpos($err_message, '%1$s') !== false ? '' : '"%1$s" - ').$err_message; // custom, e.g. // default '"%1$s" field error: Custom error message. ' + $dbgmsg = LAN_VALIDATE_FAILMSG;var_dump($lan); } //Core message