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/forum | |
| 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/forum')
| -rw-r--r-- | modules/forum/forum.admin.inc | 6 | ||||
| -rw-r--r-- | modules/forum/forum.module | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/forum/forum.admin.inc b/modules/forum/forum.admin.inc index 6bdbc494d..a16bff5ef 100644 --- a/modules/forum/forum.admin.inc +++ b/modules/forum/forum.admin.inc @@ -225,12 +225,12 @@ function forum_overview(&$form_state) { foreach (element_children($form) as $key) { if (isset($form[$key]['#term'])) { $term = $form[$key]['#term']; - $form[$key]['view']['#value'] = l($term['name'], 'forum/' . $term['tid']); + $form[$key]['view']['#markup'] = l($term['name'], 'forum/' . $term['tid']); if (in_array($form[$key]['#term']['tid'], variable_get('forum_containers', array()))) { - $form[$key]['edit']['#value'] = l(t('edit container'), 'admin/build/forum/edit/container/' . $term['tid']); + $form[$key]['edit']['#markup'] = l(t('edit container'), 'admin/build/forum/edit/container/' . $term['tid']); } else { - $form[$key]['edit']['#value'] = l(t('edit forum'), 'admin/build/forum/edit/forum/' . $term['tid']); + $form[$key]['edit']['#markup'] = l(t('edit forum'), 'admin/build/forum/edit/forum/' . $term['tid']); } } } diff --git a/modules/forum/forum.module b/modules/forum/forum.module index d7f79a84b..a4ecbeb42 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -199,7 +199,7 @@ function forum_nodeapi(&$node, $op, $teaser, $page) { if (!$teaser) { $node->content['forum_navigation'] = array( - '#value' => theme('forum_topic_navigation', $node), + '#markup' => theme('forum_topic_navigation', $node), '#weight' => 100, ); } @@ -360,7 +360,7 @@ function forum_form_alter(&$form, $form_state, $form_id) { // Hide critical options from forum vocabulary. if ($form_id == 'taxonomy_form_vocabulary') { $form['help_forum_vocab'] = array( - '#value' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'), + '#markup' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'), '#weight' => -1, ); $form['content_types']['nodes']['#required'] = TRUE; |