Projet

Général

Profil

Révision 7b2d1845

Ajouté par Assos Assos il y a presque 4 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/file_entity/file_entity.admin.inc
1195 1195

  
1196 1196
/**
1197 1197
 * Element validate callback for the maximum upload size / file extension field.
1198
 * Only validates non-empty values.
1198 1199
 */
1199 1200
function file_entity_max_filesize_extensions_validate($element, &$form_state) {
1200 1201
  $list = explode("\n", $element['#value']);
......
1203 1204
    $matches = array();
1204 1205
    preg_match('/(.*)\|(.*)/', $text, $matches);
1205 1206

  
1206
    $extension = $matches[1];
1207
    $filesize = $matches[2];
1207
    if (isset($matches[1]) && isset($matches[2]) && !empty($matches[1]) && !empty($matches[2])) {
1208
      // Only validate non-empty values.
1209
      $extension = $matches[1];
1210
      $filesize = $matches[2];
1208 1211

  
1209
    //Validate filesize.
1210
    $element['#value'] = $filesize;
1211
    _file_generic_settings_max_filesize($element, $form_state);
1212
      //Validate filesize.
1213
      $element['#value'] = $filesize;
1214
      _file_generic_settings_max_filesize($element, $form_state);
1212 1215

  
1213
    //Validate extension.
1214
    $extensions = explode(' ', $form_state['input']['file_entity_default_allowed_extensions']);
1215
    if (!in_array($extension, $extensions)) {
1216
      form_error($element, t('"!extension" was not found in the list of allowed extensions.', array('!extension' => $extension)));
1216
      //Validate extension.
1217
      $extensions = explode(' ', $form_state['input']['file_entity_default_allowed_extensions']);
1218
      if (!in_array($extension, $extensions)) {
1219
        form_error($element, t('"!extension" was not found in the list of allowed extensions.', array('!extension' => $extension)));
1220
      }
1217 1221
    }
1218 1222
  }
1219 1223
}

Formats disponibles : Unified diff