Project

General

Profile

Revision b0dc3a2e

Added by Julien Enselme over 7 years ago

Update to Drupal 7.52

View differences:

drupal7/modules/taxonomy/taxonomy.module
1023 1023
    $query->join('taxonomy_term_hierarchy', 'h', 'h.parent = t.tid');
1024 1024
    $query->addField('t', 'tid');
1025 1025
    $query->condition('h.tid', $tid);
1026
    $query->addTag('term_access');
1026
    $query->addTag('taxonomy_term_access');
1027 1027
    $query->orderBy('t.weight');
1028 1028
    $query->orderBy('t.name');
1029 1029
    $tids = $query->execute()->fetchCol();
......
1081 1081
    if ($vid) {
1082 1082
      $query->condition('t.vid', $vid);
1083 1083
    }
1084
    $query->addTag('term_access');
1084
    $query->addTag('taxonomy_term_access');
1085 1085
    $query->orderBy('t.weight');
1086 1086
    $query->orderBy('t.name');
1087 1087
    $tids = $query->execute()->fetchCol();
......
1129 1129
    $query->join('taxonomy_term_hierarchy', 'h', 'h.tid = t.tid');
1130 1130
    $result = $query
1131 1131
      ->addTag('translatable')
1132
      ->addTag('term_access')
1132
      ->addTag('taxonomy_term_access')
1133 1133
      ->fields('t')
1134 1134
      ->fields('h', array('parent'))
1135 1135
      ->condition('t.vid', $vid)
......
1249 1249
  protected function buildQuery($ids, $conditions = array(), $revision_id = FALSE) {
1250 1250
    $query = parent::buildQuery($ids, $conditions, $revision_id);
1251 1251
    $query->addTag('translatable');
1252
    $query->addTag('term_access');
1252
    $query->addTag('taxonomy_term_access');
1253 1253
    // When name is passed as a condition use LIKE.
1254 1254
    if (isset($conditions['name'])) {
1255 1255
      $query_conditions = &$query->conditions();

Also available in: Unified diff