浏览代码

Give precedence to number_alias over extension in destinations class that generates the destination select list.

markjcrane 10 年之前
父节点
当前提交
96570a27ab
共有 1 个文件被更改,包括 23 次插入5 次删除
  1. 23 5
      resources/classes/destinations.php

+ 23 - 5
resources/classes/destinations.php

@@ -203,13 +203,31 @@ class destinations {
 								}
 							}
 							else {
-								$select_value = str_replace("\${".$key."}", $data[$key], $select_value);
-								if (strlen($data['label']) == 0) {
-									$select_label = str_replace("\${".$key."}", $data[$key], $select_label);
+								if (strpos($value,',') !== false) {
+									$keys = explode(",", $value);
+									foreach ($keys as $k) {
+										if (strlen($data[$k]) > 0) {
+											$select_value = str_replace("\${".$key."}", $data[$k], $select_value);
+											if (strlen($data['label']) == 0) {
+												$select_label = str_replace("\${".$key."}", $data[$k], $select_label);
+											}
+											else {
+												$label = $data['label'];
+												$select_label = str_replace("\${".$key."}", $text2['option-'.$label]."215", $select_label);
+											}
+										}
+									}
+
 								}
 								else {
-									$label = $data['label'];
-									$select_label = str_replace("\${".$key."}", $text2['option-'.$label], $select_label);
+									$select_value = str_replace("\${".$key."}", $data[$key], $select_value);
+									if (strlen($data['label']) == 0) {
+										$select_label = str_replace("\${".$key."}", $data[$key], $select_label);
+									}
+									else {
+										$label = $data['label'];
+										$select_label = str_replace("\${".$key."}", $text2['option-'.$label], $select_label);
+									}
 								}
 							}
 						}