Cicalese has uploaded a new change for review. https://gerrit.wikimedia.org/r/234711
Change subject: bug fix for mapping explicit value list ...................................................................... bug fix for mapping explicit value list Change-Id: Iffcb3e7cb69e6c308547dc2cf47ff342ad26b2fa --- M includes/SF_FormPrinter.php 1 file changed, 15 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms refs/changes/11/234711/1 diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php index 149635e..5f582d4 100644 --- a/includes/SF_FormPrinter.php +++ b/includes/SF_FormPrinter.php @@ -1072,6 +1072,21 @@ } } // end for + + if ( array_key_exists( 'delimiter', $field_args ) ) { + $delimiter = $field_args['delimiter']; + } else { + $delimiter = ","; + } + + // If the 'values' parameter was set, separate it based on the + // 'delimiter' parameter, if any. + if ( ! empty( $values ) ) { + // Remove whitespaces, and un-escape characters + $possible_values = array_map( 'trim', explode( $delimiter, $values ) ); + $possible_values = array_map( 'htmlspecialchars_decode', $possible_values ); + } + // If we're using Cargo, there's no // equivalent for "values from property" // - instead, we just always get the @@ -1107,11 +1122,6 @@ } if ( count( $show_on_select ) > 0 ) { $field_args['show on select'] = $show_on_select; - } - if ( array_key_exists( 'delimiter', $field_args ) ) { - $delimiter = $field_args['delimiter']; - } else { - $delimiter = ","; } // Get the value from the request, if @@ -1294,15 +1304,6 @@ $field_args['origName'] = $template_name . '[' . $field_name . ']'; } else { $input_name = $template_name . '[' . $field_name . ']'; - } - - - // If the 'values' parameter was set, separate it based on the - // 'delimiter' parameter, if any. - if ( ! empty( $values ) ) { - // Remove whitespaces, and un-escape characters - $possible_values = array_map( 'trim', explode( $delimiter, $values ) ); - $possible_values = array_map( 'htmlspecialchars_decode', $possible_values ); } // if we're creating the page name from a formula based on -- To view, visit https://gerrit.wikimedia.org/r/234711 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iffcb3e7cb69e6c308547dc2cf47ff342ad26b2fa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticForms Gerrit-Branch: master Gerrit-Owner: Cicalese <cical...@mitre.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits