Projet

Général

Profil

Révision e4c061ad

Ajouté par Assos Assos il y a plus de 9 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/i18n/i18n_field/i18n_field.module
248 248
      if ($filefield && $single_value && $no_default) {
249 249
        $help_variables = array(
250 250
          'description' => field_filter_xss($instance['description']),
251
          'upload_validators' => $alter_element['#upload_validators'],
251
          'upload_validators' => isset($alter_element['#upload_validators']) ? $alter_element['#upload_validators'] : array(),
252 252
        );
253 253
        $original_description = theme('file_upload_help', $help_variables);
254 254
        if ($alter_element['#description'] == $original_description) {
255 255
          $help_variables = array(
256 256
            'description' => field_filter_xss($instance_current['description']),
257
            'upload_validators' => $alter_element['#upload_validators'],
257
            'upload_validators' => isset($alter_element['#upload_validators']) ? $alter_element['#upload_validators'] : array(),
258 258
          );
259 259
          $alter_element['#description'] = theme('file_upload_help', $help_variables);
260 260
        }
......
403 403
 * Translate field default.
404 404
 */
405 405
function i18n_field_translate_default($instance, $value, $langcode = NULL) {
406
  return i18n_string_translate(array('field', $instance['field_name'], $instance['bundle'], 'default_value'), $value, array('langcode' => $langcode));
406
  // The default value does not need sanitizing in a text_textfield widget.
407
  $sanitize = !($instance['widget']['type'] == 'text_textfield' && $instance['widget']['module'] == 'text');
408
  return i18n_string_translate(array('field', $instance['field_name'], $instance['bundle'], 'default_value'), $value, array('langcode' => $langcode, 'sanitize' => $sanitize));
407 409
}
408 410

  
409 411
/**

Formats disponibles : Unified diff