summaryrefslogtreecommitdiff
path: root/modules/upload/upload.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2008-07-16 21:59:29 +0000
committerDries Buytaert <dries@buytaert.net>2008-07-16 21:59:29 +0000
commit57fe5103daf5db65cd43f309e0f22f5c4781605d (patch)
treef111e494e7ce2c666727c35541b3758c3c0dad84 /modules/upload/upload.module
parent11b9f390bfc37d8df0fabde3a3417d60b55f8de4 (diff)
downloadbrdo-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/upload/upload.module')
-rw-r--r--modules/upload/upload.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index dde2395db..fce3eec39 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -283,7 +283,7 @@ function upload_nodeapi(&$node, $op, $teaser) {
if (count($node->files)) {
if (!$teaser && user_access('view uploaded files')) {
$node->content['files'] = array(
- '#value' => theme('upload_attachments', $node->files),
+ '#markup' => theme('upload_attachments', $node->files),
'#weight' => 50,
);
}
@@ -484,7 +484,7 @@ function _upload_form($node) {
$description = file_create_url($file->filepath);
$description = "<small>" . check_plain($description) . "</small>";
$form['files'][$key]['description'] = array('#type' => 'textfield', '#default_value' => !empty($file->description) ? $file->description : $file->filename, '#maxlength' => 256, '#description' => $description );
- $form['files'][$key]['size'] = array('#value' => format_size($file->filesize));
+ $form['files'][$key]['size'] = array('#markup' => format_size($file->filesize));
$form['files'][$key]['remove'] = array('#type' => 'checkbox', '#default_value' => !empty($file->remove));
$form['files'][$key]['list'] = array('#type' => 'checkbox', '#default_value' => $file->list);
$form['files'][$key]['weight'] = array('#type' => 'weight', '#delta' => count($node->files), '#default_value' => $file->weight);