| Index: trunk/extensions/SemanticForms/includes/SF_TemplateField.inc |
| — | — | @@ -70,12 +70,6 @@ |
| 71 | 71 | if (count($types) > 0) |
| 72 | 72 | $this->field_type = $types[0]->getWikiValue(); |
| 73 | 73 | |
| 74 | | - // HACK - if there were any possible values, set the field |
| 75 | | - // type to be 'enumeration', regardless of what the actual type is |
| 76 | | - if (count($this->possible_values) > 0) { |
| 77 | | - $this->field_type = 'enumeration'; |
| 78 | | - } |
| 79 | | - |
| 80 | 74 | foreach ($allowed_values as $value) { |
| 81 | 75 | // HTML-unencode each value |
| 82 | 76 | $wiki_value = html_entity_decode($value->getWikiValue()); |
| — | — | @@ -88,6 +82,12 @@ |
| 89 | 83 | $this->value_labels[$wiki_value] = html_entity_decode($label_value->getWikiValue()); |
| 90 | 84 | } |
| 91 | 85 | } |
| | 86 | + |
| | 87 | + // HACK - if there were any possible values, set the field |
| | 88 | + // type to be 'enumeration', regardless of what the actual type is |
| | 89 | + if (count($this->possible_values) > 0) { |
| | 90 | + $this->field_type = 'enumeration'; |
| | 91 | + } |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | /** |