Skip to content
Snippets Groups Projects
Commit 3a83f2e7 authored by Alex Barth's avatar Alex Barth
Browse files

Convert #value to #markup where required.

parent 35bae888
No related branches found
No related tags found
No related merge requests found
...@@ -488,7 +488,7 @@ function feeds_ui_mapping_form($form, &$form_state, $importer) { ...@@ -488,7 +488,7 @@ function feeds_ui_mapping_form($form, &$form_state, $importer) {
$form = array(); $form = array();
$form['#importer'] = $importer; $form['#importer'] = $importer;
$form['#mappings'] = $mappings = $importer->processor->getMappings(); $form['#mappings'] = $mappings = $importer->processor->getMappings();
$form['help']['#value'] = feeds_ui_mapping_help(); $form['help']['#markup'] = feeds_ui_mapping_help();
// Get mapping sources from parsers and targets from processor, format them // Get mapping sources from parsers and targets from processor, format them
// for output. // for output.
...@@ -496,18 +496,18 @@ function feeds_ui_mapping_form($form, &$form_state, $importer) { ...@@ -496,18 +496,18 @@ function feeds_ui_mapping_form($form, &$form_state, $importer) {
if ($sources = $importer->parser->getMappingSources()) { if ($sources = $importer->parser->getMappingSources()) {
$source_options = _feeds_ui_format_options($sources); $source_options = _feeds_ui_format_options($sources);
foreach ($sources as $k => $source) { foreach ($sources as $k => $source) {
$legend['sources'][$k]['name']['#value'] = empty($source['name']) ? $k : $source['name']; $legend['sources'][$k]['name']['#markup'] = empty($source['name']) ? $k : $source['name'];
$legend['sources'][$k]['description']['#value'] = empty($source['description']) ? '' : $source['description']; $legend['sources'][$k]['description']['#markup'] = empty($source['description']) ? '' : $source['description'];
} }
} }
else { else {
$legend['sources']['#value'] = t('This parser supports free source definitions. Enter the name of the source field in lower case into the Source text field above.'); $legend['sources']['#markup'] = t('This parser supports free source definitions. Enter the name of the source field in lower case into the Source text field above.');
} }
$targets = $importer->processor->getMappingTargets(); $targets = $importer->processor->getMappingTargets();
$target_options = _feeds_ui_format_options($targets); $target_options = _feeds_ui_format_options($targets);
foreach ($targets as $k => $target) { foreach ($targets as $k => $target) {
$legend['targets'][$k]['name']['#value'] = empty($target['name']) ? $k : $target['name']; $legend['targets'][$k]['name']['#markup'] = empty($target['name']) ? $k : $target['name'];
$legend['targets'][$k]['description']['#value'] = empty($target['description']) ? '' : $target['description']; $legend['targets'][$k]['description']['#markup'] = empty($target['description']) ? '' : $target['description'];
} }
// Legend explaining source and target elements. // Legend explaining source and target elements.
...@@ -840,7 +840,7 @@ function theme_feeds_ui_mapping_form($variables) { ...@@ -840,7 +840,7 @@ function theme_feeds_ui_mapping_form($variables) {
// Stick tables into collapsible fieldset. // Stick tables into collapsible fieldset.
$form['legendset']['legend'] = array( $form['legendset']['legend'] = array(
'#value' => '<div>'. $legend .'</div>', '#markup' => '<div>'. $legend .'</div>',
); );
$output .= drupal_render($form['legendset']); $output .= drupal_render($form['legendset']);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment