Changeset View
Changeset View
Standalone View
Standalone View
branches/5.2.x/core/kernel/utility/validator.php
| Show First 20 Lines • Show All 434 Lines • ▼ Show 20 Line(s) | |||||
| if ( isset($this->FieldErrors[$field]['params']) ) { | if ( isset($this->FieldErrors[$field]['params']) ) { | ||||
| $params = $this->FieldErrors[$field]['params']; | $params = $this->FieldErrors[$field]['params']; | ||||
| } | } | ||||
| else { | else { | ||||
| $params = array(); | $params = array(); | ||||
| } | } | ||||
| if ( $params && preg_match('/%[^\s]/', $msg) ) { | |||||
| $msg = vsprintf($msg, array_values($params)); | |||||
| } | |||||
| else { | |||||
| $field_phrase = $this->Application->isAdmin ? 'la_fld_' . $field : 'lu_fld_' . $field; | $field_phrase = $this->Application->isAdmin ? 'la_fld_' . $field : 'lu_fld_' . $field; | ||||
| $params['field'] = $this->Application->Phrase($field_phrase); | $params['field'] = $this->Application->Phrase($field_phrase); | ||||
| foreach ( $params as $param_name => $param_value ) { | foreach ( $params as $param_name => $param_value ) { | ||||
| $msg = str_replace('{' . $param_name . '}', $param_value, $msg, $replacement_count); | $msg = str_replace('{' . $param_name . '}', $param_value, $msg); | ||||
| } | } | ||||
| if ( strpos($msg, '%s') !== false ) { | |||||
| trigger_error('Unexpected "%s" in field "<b>' . $field . '</b>" validation error message (pseudo: "<b>' . $error_pseudo . '</b>") in "<b>' . $this->dataSource->Prefix . '</b>" unit', E_USER_WARNING); | |||||
| } | } | ||||
| return $msg; | return $msg; | ||||
| } | } | ||||
| /** | /** | ||||
| * Returns error pseudo | * Returns error pseudo | ||||
| * | * | ||||
| ▲ Show 20 Lines • Show All 68 Lines • Show Last 20 Lines | |||||