Index: trunk/core/kernel/utility/formatters/password_formatter.php =================================================================== diff -u -N -r7635 -r8842 --- trunk/core/kernel/utility/formatters/password_formatter.php (.../password_formatter.php) (revision 7635) +++ trunk/core/kernel/utility/formatters/password_formatter.php (.../password_formatter.php) (revision 8842) @@ -35,6 +35,14 @@ return $value; } + /** + * Performs password & verify password field validation + * + * @param mixed $value + * @param string $field_name + * @param kDBItem $object + * @return string + */ function Parse($value, $field_name, &$object) { $options = $object->GetFieldOptions($field_name); @@ -81,20 +89,16 @@ } $min_length = $this->Application->ConfigValue('Min_Password'); - if( strlen($new_password) >= $min_length ) - { - if($new_password != $verify_password) - { - $object->ErrorMsgs['passwords_do_not_match'] = $this->Application->Phrase('lu_passwords_do_not_match'); - $object->FieldErrors[$password_field]['pseudo'] = 'passwords_do_not_match'; - $object->FieldErrors[$verify_field]['pseudo'] = 'passwords_do_not_match'; + if (strlen($new_password) >= $min_length) { + if ($new_password != $verify_password) { + $object->SetError($password_field, 'passwords_do_not_match', 'lu_passwords_do_not_match'); + $object->SetError($verify_field, 'passwords_do_not_match', 'lu_passwords_do_not_match'); } } - else - { - $object->ErrorMsgs['passwords_min_length'] = sprintf($this->Application->Phrase('lu_passwords_too_short'), $min_length); - $object->FieldErrors[$password_field]['pseudo'] = 'passwords_min_length'; - $object->FieldErrors[$verify_field]['pseudo'] = 'passwords_min_length'; + else { + $error_msg = '+'.sprintf($this->Application->Phrase('lu_passwords_too_short'), $min_length); // + -> not phrase + $object->SetError($password_field, 'passwords_min_length', $error_msg); + $object->SetError($verify_field, 'passwords_min_length', $error_msg); } } if($value == '') return $object->GetDBField($field_name);