Projet

Général

Profil

Révision 7b974d86

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.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 2017-10-31
36
version = "7.x-2.12"
35
; Information added by Drupal.org packaging script on 2018-01-08
36
version = "7.x-2.15"
37 37
core = "7.x"
38 38
project = "file_entity"
39
datestamp = "1509415090"
39
datestamp = "1515421989"
40 40

  
drupal7/sites/all/modules/file_entity/file_entity.module
1844 1844
    return;
1845 1845
  }
1846 1846

  
1847
  // A conflict with og_query_og_membership_alter() causes a fatal error
1848
  // if both hooks alter the query.
1849
  if (module_exists('og') && $query->hasTag('og_membership')) {
1850
    foreach($query->getMetaData('entity_field_query')->fields as $field) {
1851
      if (og_is_group_audience_field($field['field_name'])) {
1852
        return;
1853
      }
1854
    }
1855
  }
1856

  
1847 1857
  $tables = $query->getTables();
1848 1858
  $base_table = $query->getMetaData('base_table');
1849 1859
  // Do not use the base table for general entity queries unless this is
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 2017-10-31
9
version = "7.x-2.12"
8
; Information added by Drupal.org packaging script on 2018-01-08
9
version = "7.x-2.15"
10 10
core = "7.x"
11 11
project = "file_entity"
12
datestamp = "1509415090"
12
datestamp = "1515421989"
13 13

  

Formats disponibles : Unified diff