diff options
Diffstat (limited to 'modules/upload')
| -rw-r--r-- | modules/upload/upload.admin.inc | 2 | ||||
| -rw-r--r-- | modules/upload/upload.module | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/upload/upload.admin.inc b/modules/upload/upload.admin.inc index c22e7ed07..a773bd884 100644 --- a/modules/upload/upload.admin.inc +++ b/modules/upload/upload.admin.inc @@ -107,7 +107,7 @@ function upload_admin_settings() { '#field_suffix' => t('MB'), ); - $form['settings_general']['upload_max_size'] = array('#value' => '<p>' . t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))) . '</p>'); + $form['settings_general']['upload_max_size'] = array('#markup' => '<p>' . t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))) . '</p>'); $roles = user_roles(FALSE, 'upload files'); $form['roles'] = array('#type' => 'value', '#value' => $roles); 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); |