diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-07-16 21:59:29 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-07-16 21:59:29 +0000 |
| commit | 57fe5103daf5db65cd43f309e0f22f5c4781605d (patch) | |
| tree | f111e494e7ce2c666727c35541b3758c3c0dad84 /modules/taxonomy | |
| parent | 11b9f390bfc37d8df0fabde3a3417d60b55f8de4 (diff) | |
| download | brdo-57fe5103daf5db65cd43f309e0f22f5c4781605d.tar.gz brdo-57fe5103daf5db65cd43f309e0f22f5c4781605d.tar.bz2 | |
- Patch #252013 by Eaton, pwolanin, Susurrus et al: drupal_render() now printes #markup, not #value.
Diffstat (limited to 'modules/taxonomy')
| -rw-r--r-- | modules/taxonomy/taxonomy.admin.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc index 3dae29628..0558995fc 100644 --- a/modules/taxonomy/taxonomy.admin.inc +++ b/modules/taxonomy/taxonomy.admin.inc @@ -23,12 +23,12 @@ function taxonomy_overview_vocabularies() { $types[] = $node_type ? check_plain($node_type) : check_plain($type); } $form[$vocabulary->vid]['#vocabulary'] = (array)$vocabulary; - $form[$vocabulary->vid]['name'] = array('#value' => check_plain($vocabulary->name)); - $form[$vocabulary->vid]['types'] = array('#value' => implode(', ', $types)); + $form[$vocabulary->vid]['name'] = array('#markup' => check_plain($vocabulary->name)); + $form[$vocabulary->vid]['types'] = array('#markup' => implode(', ', $types)); $form[$vocabulary->vid]['weight'] = array('#type' => 'weight', '#delta' => 10, '#default_value' => $vocabulary->weight); - $form[$vocabulary->vid]['edit'] = array('#value' => l(t('edit vocabulary'), "admin/content/taxonomy/edit/vocabulary/$vocabulary->vid")); - $form[$vocabulary->vid]['list'] = array('#value' => l(t('list terms'), "admin/content/taxonomy/$vocabulary->vid")); - $form[$vocabulary->vid]['add'] = array('#value' => l(t('add terms'), "admin/content/taxonomy/$vocabulary->vid/add/term")); + $form[$vocabulary->vid]['edit'] = array('#markup' => l(t('edit vocabulary'), "admin/content/taxonomy/edit/vocabulary/$vocabulary->vid")); + $form[$vocabulary->vid]['list'] = array('#markup' => l(t('list terms'), "admin/content/taxonomy/$vocabulary->vid")); + $form[$vocabulary->vid]['add'] = array('#markup' => l(t('add terms'), "admin/content/taxonomy/$vocabulary->vid/add/term")); } // Only make this form include a submit button and weight if more than one @@ -387,7 +387,7 @@ function taxonomy_overview_terms(&$form_state, $vocabulary) { unset($form[$key]['#term']['parents'], $term->parents); } - $form[$key]['view'] = array('#value' => l($term->name, "taxonomy/term/$term->tid")); + $form[$key]['view'] = array('#markup' => l($term->name, "taxonomy/term/$term->tid")); if (!$vocabulary->tags && $vocabulary->hierarchy < 2 && count($tree) > 1) { $form['#parent_fields'] = TRUE; $form[$key]['tid'] = array( @@ -405,7 +405,7 @@ function taxonomy_overview_terms(&$form_state, $vocabulary) { '#default_value' => $term->depth, ); } - $form[$key]['edit'] = array('#value' => l(t('edit'), "admin/content/taxonomy/edit/term/$term->tid", array('query' => drupal_get_destination()))); + $form[$key]['edit'] = array('#markup' => l(t('edit'), "admin/content/taxonomy/edit/term/$term->tid", array('query' => drupal_get_destination()))); } $form['#total_entries'] = $total_entries; |