diff --git a/core/modules/file/file.field.inc b/core/modules/file/file.field.inc index 3305a00..056066a 100644 --- a/core/modules/file/file.field.inc +++ b/core/modules/file/file.field.inc @@ -715,7 +715,7 @@ function theme_file_widget_multiple($variables) { * * @param $variables * An associative array containing: - * - description: The normal description for this field, specified by the + * - user_description: The normal description for this field, specified by the * user. * - upload_validators: An array of upload validators as used in * $element['#upload_validators']. @@ -723,7 +723,7 @@ function theme_file_widget_multiple($variables) { * @ingroup themeable */ function theme_file_upload_help($variables) { - $description = $variables['description']; + $description = $variables['user_description']; $upload_validators = $variables['upload_validators']; $cardinality = $variables['cardinality']; diff --git a/core/modules/file/file.module b/core/modules/file/file.module index 4a45b51..9fb5cdb 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -598,7 +598,7 @@ function file_theme() { 'variables' => array('items' => NULL), ), 'file_upload_help' => array( - 'variables' => array('description' => NULL, 'upload_validators' => NULL, 'cardinality' => NULL), + 'variables' => array('user_description' => NULL, 'upload_validators' => NULL, 'cardinality' => NULL), ), ); } diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/widget/FileWidget.php b/core/modules/file/lib/Drupal/file/Plugin/field/widget/FileWidget.php index 63564fa..b74b5fa 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/field/widget/FileWidget.php +++ b/core/modules/file/lib/Drupal/file/Plugin/field/widget/FileWidget.php @@ -164,7 +164,7 @@ protected function formMultipleElements(EntityInterface $entity, array $items, $ // field. These are added here so that they may be referenced easily // through a hook_form_alter(). $elements['#file_upload_title'] = t('Add a new file'); - $elements['#file_upload_description'] = theme('file_upload_help', array('description' => '', 'upload_validators' => $elements[0]['#upload_validators'], 'cardinality' => $cardinality)); + $elements['#file_upload_description'] = theme('file_upload_help', array('user_description' => '', 'upload_validators' => $elements[0]['#upload_validators'], 'cardinality' => $cardinality)); } return $elements; @@ -225,7 +225,7 @@ public function formElement(array $items, $delta, array $element, $langcode, arr $default_fids = $element['#extended'] ? $element['#default_value']['fids'] : $element['#default_value']; if (empty($default_fids)) { - $element['#description'] = theme('file_upload_help', array('description' => $element['#description'], 'upload_validators' => $element['#upload_validators'], 'cardinality' => $cardinality)); + $element['#description'] = theme('file_upload_help', array('user_description' => $element['#description'], 'upload_validators' => $element['#upload_validators'], 'cardinality' => $cardinality)); $element['#multiple'] = $cardinality != 1 ? TRUE : FALSE; if ($cardinality != 1 && $cardinality != -1) { $element['#element_validate'] = array('file_field_widget_multiple_count_validate'); diff --git a/core/modules/image/lib/Drupal/image/Plugin/field/widget/ImageWidget.php b/core/modules/image/lib/Drupal/image/Plugin/field/widget/ImageWidget.php index d0ae8fa..130011c 100644 --- a/core/modules/image/lib/Drupal/image/Plugin/field/widget/ImageWidget.php +++ b/core/modules/image/lib/Drupal/image/Plugin/field/widget/ImageWidget.php @@ -87,7 +87,7 @@ protected function formMultipleElements(EntityInterface $entity, array $items, $ if ($cardinality == 1) { // If there's only one field, return it as delta 0. if (empty($elements[0]['#default_value']['fids'])) { - $elements[0]['#description'] = theme('file_upload_help', array('description' => $this->fieldDefinition->getFieldDescription(), 'upload_validators' => $elements[0]['#upload_validators'], 'cardinality' => $cardinality)); + $elements[0]['#description'] = theme('file_upload_help', array('user_description' => $this->fieldDefinition->getFieldDescription(), 'upload_validators' => $elements[0]['#upload_validators'], 'cardinality' => $cardinality)); } } else { diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc index a59c464..c98ccbf 100644 --- a/core/modules/locale/locale.bulk.inc +++ b/core/modules/locale/locale.bulk.inc @@ -54,7 +54,7 @@ function locale_translate_import_form($form, &$form_state) { $form['file'] = array( '#type' => 'file', '#title' => t('Translation file'), - '#description' => theme('file_upload_help', array('description' => t('A Gettext Portable Object file.'), 'upload_validators' => $validators)), + '#description' => theme('file_upload_help', array('user_description' => t('A Gettext Portable Object file.'), 'upload_validators' => $validators)), '#size' => 50, '#upload_validators' => $validators, '#attributes' => array('class' => array('file-import-input')),