Projet

Général

Profil

Révision 3acd948f

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

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/file_entity/file_entity.pages.inc
827 827 
    $replacement = $form_state['values']['replace_upload'];
828 828 
    // Move file from temp to permanent home.
829 829 
    if (pathinfo($replacement->uri, PATHINFO_EXTENSION) == pathinfo($file->uri, PATHINFO_EXTENSION)) {
830 
        file_unmanaged_copy($replacement->uri, $file->uri, FILE_EXISTS_REPLACE);
830 
      if ($new_file_uri = file_unmanaged_copy($replacement->uri, $file->uri, FILE_EXISTS_REPLACE)) {
831 
        // Remove temporary file.
832 
        file_delete($replacement);
833 
      }
831 834 
    } else {
832 835 
      $destination_uri = rtrim($file->uri, drupal_basename($file->uri)) . drupal_basename($replacement->uri);
833 836 
      $replace_mode = $destination_uri == $file->uri ? FILE_EXISTS_REPLACE : FILE_EXISTS_RENAME;
......
839 842 

  		




  840
  843
  
    
        // Update if the uri target has changed.


  		




  841
  844
  
    
        if ($new_file_uri != $file->uri) {


  		




  842
  
  
    
         // Store the original file uri to delete if save is successful.


  		




  843
  
  
    
         $orphaned_uri = $file->uri;


  		




  
  845
  
    
          // Store the original file uri to delete if save is successful.


  		




  
  846
  
    
          $orphaned_uri = $file->uri;


  		




  844
  847
  
    

  		




  845
  848
  
    
          // Update file entity uri.


  		




  846
  849
  
    
          $file->uri = $new_file_uri;


  		












Formats disponibles :  Unified diff