In-Portal Issue Tracker

Index: db_tag_processor.php
===================================================================
--- db_tag_processor.php	(revision 14745)
+++ db_tag_processor.php	(working copy)
@@ -1158,9 +1158,16 @@
 
 		$options = $field_options['options'];
 
-		if (array_key_exists('has_empty', $params) && $params['has_empty']) {
+		if ( array_key_exists('has_empty', $params) && $params['has_empty'] ) {
 			$empty_value = array_key_exists('empty_value', $params) ? $params['empty_value'] : '';
-			$options = kUtil::array_merge_recursive(Array ($empty_value => ''), $options); // don't use other array merge function, because they will reset keys !!!
+			$empty_label = isset($params['empty_label']) ? $params['empty_label'] : '';
+
+			if ( $empty_label ) {
+				$empty_label = $this->Application->Phrase($empty_label, false);
+			}
+
+			// don't use other array merge function, because they will reset keys !!!
+			$options = kUtil::array_merge_recursive(Array ($empty_value => $empty_label), $options);
 		}
 
 		$block_params = $this->prepareTagParams($params);

Index: kernel/db/db_tag_processor.php
===================================================================
--- kernel/db/db_tag_processor.php	(revision 14767)
+++ kernel/db/db_tag_processor.php	(working copy)
@@ -1163,7 +1163,13 @@
 			$empty_label = isset($params['empty_label']) ? $params['empty_label'] : '';
 
 			if ( $empty_label ) {
-				$empty_label = $this->Application->Phrase($empty_label, false);
+				if ( mb_substr($empty_label, 0, 1) == '+' ) {
+					// using plain text instead of phrase label
+					$empty_label = mb_substr($empty_label, 1);
+				}
+				else {
+					$empty_label = $this->Application->Phrase($empty_label, false);
+				}
 			}
 
 			// don't use other array merge function, because they will reset keys !!!