Projet

Général

Profil

Révision 66c11afc

Ajouté par Assos Assos il y a presque 6 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/file_entity/file_entity.file.inc
116 116
      _file_entity_update_image_field_dimensions($file);
117 117
    }
118 118

  
119
    // Flush image style derivatives whenever an image is updated.
120
    image_path_flush($file->uri);
119
    // Flush image style derivatives whenever an image is replaced.
120
    if (empty($file->file_entity_skip_image_flush) && file_entity_has_file_changed($file)) {
121
      image_path_flush($file->uri);
122
    }
121 123
  }
122 124

  
123 125
  // Clear any related field caches.
124 126
  file_entity_invalidate_field_caches($file);
125 127
}
126 128

  
129
/**
130
 * Returns whether the file has changed
131
 */
132
function file_entity_has_file_changed($file) {
133
  return empty($file->is_new) || empty($file->original) || $file->filesize != $file->original->filesize || $file->uri != $file->original->uri;
134
}
135

  
136

  
127 137
/**
128 138
 * Implements hook_file_delete().
129 139
 */
drupal7/sites/all/modules/file_entity/file_entity.info
32 32
; We have to add a fake version so Git checkouts do not fail Media dependencies
33 33
version = 7.x-2.x-dev
34 34

  
35
; Information added by Drupal.org packaging script on 2018-05-02
36
version = "7.x-2.21"
35
; Information added by Drupal.org packaging script on 2018-06-14
36
version = "7.x-2.22"
37 37
core = "7.x"
38 38
project = "file_entity"
39
datestamp = "1525293788"
39
datestamp = "1528996427"
drupal7/sites/all/modules/file_entity/file_entity.pages.inc
835 835
  if (!empty($form_state['values']['replace_upload'])) {
836 836
    $replacement = $form_state['values']['replace_upload'];
837 837
    // Move file from temp to permanent home.
838
    if (pathinfo($replacement->uri, PATHINFO_EXTENSION) == pathinfo($file->uri, PATHINFO_EXTENSION)) {
839
      if ($new_file_uri = file_unmanaged_copy($replacement->uri, $file->uri, FILE_EXISTS_REPLACE)) {
840
        // Remove temporary file.
841
        file_delete($replacement);
842
      }
843
    } else {
844
      if (!empty($form_state['values']['replace_keep_original_filename'])
845
      && $form_state['values']['replace_keep_original_filename']) {
846
        $destination_uri = rtrim($file->uri, drupal_basename($file->uri)) . drupal_basename($file->uri);
847
      }
848
      else {
849
        $destination_uri = rtrim($file->uri, drupal_basename($file->uri)) . drupal_basename($replacement->uri);
850
      }
851
      $replace_mode = $destination_uri == $file->uri ? FILE_EXISTS_REPLACE : FILE_EXISTS_RENAME;
852
      if ($new_file_uri = file_unmanaged_copy($replacement->uri, $destination_uri, $replace_mode)) {
853
        // @todo Add watchdog() about replaced file here?
838
    if (!empty($form_state['values']['replace_keep_original_filename'])
839
    && $form_state['values']['replace_keep_original_filename']) {
840
      $destination_uri = rtrim($file->uri, drupal_basename($file->uri)) . drupal_basename($file->uri);
841
    }
842
    else {
843
      $destination_uri = rtrim($file->uri, drupal_basename($file->uri)) . drupal_basename($replacement->uri);
844
    }
845
    $replace_mode = $destination_uri == $file->uri ? FILE_EXISTS_REPLACE : FILE_EXISTS_RENAME;
846
    if ($new_file_uri = file_unmanaged_copy($replacement->uri, $destination_uri, $replace_mode)) {
847
      // @todo Add watchdog() about replaced file here?
854 848

  
855
        // Remove temporary file.
856
        file_delete($replacement);
849
      // Remove temporary file.
850
      file_delete($replacement);
857 851

  
858
        // Update if the uri target has changed.
859
        if ($new_file_uri != $file->uri) {
860
          // Store the original file uri to delete if save is successful.
861
          $orphaned_uri = $file->uri;
852
      // Update if the uri target has changed.
853
      if ($new_file_uri != $file->uri) {
854
        // Store the original file uri to delete if save is successful.
855
        $orphaned_uri = $file->uri;
862 856

  
863
          // Update file entity uri.
864
          $file->uri = $new_file_uri;
865
        }
857
        // Update file entity uri.
858
        $file->uri = $new_file_uri;
866 859
      }
867 860
    }
868 861
  }
drupal7/sites/all/modules/file_entity/tests/file_entity_test.info
5 5
dependencies[] = file_entity
6 6
hidden = TRUE
7 7

  
8
; Information added by Drupal.org packaging script on 2018-05-02
9
version = "7.x-2.21"
8
; Information added by Drupal.org packaging script on 2018-06-14
9
version = "7.x-2.22"
10 10
core = "7.x"
11 11
project = "file_entity"
12
datestamp = "1525293788"
12
datestamp = "1528996427"

Formats disponibles : Unified diff