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.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

Formats disponibles : Unified diff