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/system/system.module | |
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/system/system.module')
-rw-r--r-- | modules/system/system.module | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/system/system.module b/modules/system/system.module index 26a143cb7..3e6bc8418 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -291,7 +291,7 @@ function system_elements() { * Form structure. */ $type['item'] = array( - '#value' => '', + '#markup' => '', ); $type['hidden'] = array( @@ -868,8 +868,8 @@ function system_theme_select_form($description = '', $default_value = '', $weigh $screenshot = $screenshot ? theme('image', $screenshot, t('Screenshot for %theme theme', array('%theme' => $info->name)), '', array('class' => 'screenshot'), FALSE) : t('no screenshot'); - $form['themes'][$info->key]['screenshot'] = array('#value' => $screenshot); - $form['themes'][$info->key]['description'] = array('#type' => 'item', '#title' => $info->name, '#value' => dirname($info->filename) . ($info->name == variable_get('theme_default', 'garland') ? '<br /> <em>' . t('(site default theme)') . '</em>' : '')); + $form['themes'][$info->key]['screenshot'] = array('#markup' => $screenshot); + $form['themes'][$info->key]['description'] = array('#type' => 'item', '#title' => $info->name, '#markup' => dirname($info->filename) . ($info->name == variable_get('theme_default', 'garland') ? '<br /> <em>' . t('(site default theme)') . '</em>' : '')); $options[$info->key] = ''; } @@ -1305,12 +1305,12 @@ function confirm_form($form, $question, $path, $description = NULL, $yes = NULL, $form['#skip_duplicate_check'] = TRUE; $form['#attributes'] = array('class' => 'confirmation'); - $form['description'] = array('#value' => $description); + $form['description'] = array('#markup' => $description); $form[$name] = array('#type' => 'hidden', '#value' => 1); $form['actions'] = array('#prefix' => '<div class="container-inline">', '#suffix' => '</div>'); $form['actions']['submit'] = array('#type' => 'submit', '#value' => $yes ? $yes : t('Confirm')); - $form['actions']['cancel'] = array('#value' => $cancel); + $form['actions']['cancel'] = array('#markup' => $cancel); $form['#theme'] = 'confirm_form'; return $form; } |