Index: branches/5.2.x/core/kernel/db/db_tag_processor.php =================================================================== diff -u -N -r14694 -r14696 --- branches/5.2.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 14694) +++ branches/5.2.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 14696) @@ -1,6 +1,6 @@ getObject($params); + /* @var $object kDBItem */ + + $value = $params['value']; + $field = $this->SelectParam($params, 'name,field'); + + $field_options = $object->GetFieldOptions($field); + + if ( isset($field_options['options'][$value]) ) { + $value = $field_options['options'][$value]; + $use_phrases = isset($field_options['use_phrases']) ? $field_options['use_phrases'] : false; + + return $use_phrases ? $this->Application->Phrase($value) : $value; + } + + return ''; + } + + /** * Returns/sets form name for current object * * @param Array $params Index: branches/5.2.x/core/admin_templates/incs/form_blocks.tpl =================================================================== diff -u -N -r14637 -r14696 --- branches/5.2.x/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 14637) +++ branches/5.2.x/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 14696) @@ -613,6 +613,10 @@ + + + + @@ -694,6 +698,10 @@ + + checked id="_" value="" onclick="update_checkbox_options(/^_([0-9A-Za-z-]+)/, '');">  + +