Projet

Général

Profil

Révision 0939d55c

Ajouté par Assos Assos il y a environ 7 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/media/media.install
869 869 
      // Merge existing type with new ones.
870 870 
      if ($new_type = file_type_load($type->name)) {
871 871 
        $new_type->mimetypes = array_merge($type->mimetypes, $new_type->mimetypes);
872 
        $new_type->streams = array_merge($type->streams, $new_type->streams);
872 
        if (!empty($new_type->streams)) {
873 
          $new_type->streams = array_merge($type->streams, $new_type->streams);
874 
        }
875 
        else{
876 
          $new_type->streams = $type->streams;
877 
        }
873 878 
      }
874 879 
      else {
875 880 
        $new_type = $type;

Formats disponibles : Unified diff