D2.id21.diff
No OneTemporary
Actions

Subscribers

None

File Metadata

	Index: core/kernel/utility/validator.php
	===================================================================
	--- core/kernel/utility/validator.php
	+++ core/kernel/utility/validator.php
	@@ -1,6 +1,6 @@
	<?php
	/**
	-* @version $Id: validator.php 16080 2014-09-19 15:23:59Z alex $
	+* @version $Id: validator.php 15522 2012-08-20 15:25:51Z alex $
	* @package In-Portal
	* @copyright Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
	* @license GNU/GPL
	@@ -438,7 +438,15 @@
	$params = array();
	}

	- $field_phrase = $this->Application->isAdmin ? 'la_fld_' . $field : 'lu_fld_' . $field;
	+ $field_options = $this->dataSource->GetFieldOptions($field);
	+
	+ if ( $this->Application->isAdmin ) {
	+ $field_phrase = !empty($field_options['admin_label']) ? $field_options['admin_label'] : 'la_fld_' . $field;
	+ }
	+ else {
	+ $field_phrase = !empty($field_options['front_label']) ? $field_options['front_label'] : 'lu_fld_' . $field;
	+ }
	+
	$params['field'] = $this->Application->Phrase($field_phrase);

	foreach ( $params as $param_name => $param_value ) {