diff options
Diffstat (limited to 'modules/taxonomy/taxonomy.pages.inc')
| -rw-r--r-- | modules/taxonomy/taxonomy.pages.inc | 55 |
1 files changed, 2 insertions, 53 deletions
diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc index e6d68d2cc..88c0d829d 100644 --- a/modules/taxonomy/taxonomy.pages.inc +++ b/modules/taxonomy/taxonomy.pages.inc @@ -40,8 +40,7 @@ function taxonomy_term_page($term) { '#suffix' => '</div>', ); } - - if ($nids = taxonomy_select_nodes(array($term->tid), NULL, TRUE)) { + if ($nids = taxonomy_select_nodes($term)) { $nodes = node_load_multiple($nids); $build += node_build_multiple($nodes); $build['pager'] = array( @@ -71,7 +70,7 @@ function taxonomy_term_feed($term) { // Only display the description if we have a single term, to avoid clutter and confusion. // HTML will be removed from feed description, so no need to filter here. $channel['description'] = $term->description; - $nids = taxonomy_select_nodes(array($term->tid, NULL, NULL, FALSE)); + $nids = taxonomy_select_nodes(array($term->tid, FALSE)); node_feed($nids, $channel); } @@ -91,56 +90,6 @@ function taxonomy_term_edit($term) { /** * Helper function for autocompletion */ -function taxonomy_autocomplete_legacy($vid = 0, $tags_typed = '') { - // The user enters a comma-separated list of tags. We only autocomplete the last tag. - $tags_typed = drupal_explode_tags($tags_typed); - $tag_last = drupal_strtolower(array_pop($tags_typed)); - - $matches = array(); - if ($tag_last != '') { - $query = db_select('taxonomy_term_data', 't'); - $query->addTag('term_access'); - $query->leftJoin('taxonomy_term_synonym', 'ts', 't.tid = ts.tid'); - // Don't select already entered terms. - if (count($tags_typed)) { - $query->condition('t.name', $tags_typed, 'NOT IN'); - } - $tags_return = $query - ->fields('t', array('tid', 'name')) - ->condition('t.vid', $vid) - // Select rows that either match by term or synonym name. - ->condition(db_or() - ->where("LOWER(t.name) LIKE :last_string", array(':last_string' => '%' . $tag_last . '%')) - ->where("LOWER(ts.name) LIKE :last_string", array(':last_string' => '%' . $tag_last . '%')) - ) - ->range(0, 10) - ->execute() - ->fetchAllKeyed(); - - $prefix = count($tags_typed) ? implode(', ', $tags_typed) . ', ' : ''; - - // We use two arrays to make sure synonym suggestions appear last. - $term_matches = $synonym_matches = array(); - foreach ($tags_return as $tid => $name) { - $n = $name; - // Commas and quotes in terms are special cases, so encode 'em. - if (strpos($name, ',') !== FALSE || strpos($name, '"') !== FALSE) { - $n = '"' . str_replace('"', '""', $name) . '"'; - } - // Inform the user his query matched a synonym rather than a term. - if (strpos(drupal_strtolower($name), $tag_last) === FALSE) { - $name = t('Did you mean %suggestion', array('%suggestion' => $name)); - $synonym_matches[$prefix . $n] = filter_xss($name); - } - } - } - - drupal_json_output(array_merge($term_matches, $synonym_matches)); -} - -/** - * Helper function for autocompletion - */ function taxonomy_autocomplete($field_name, $bundle, $tags_typed = '') { $instance = field_info_instance($field_name, $bundle); $field = field_info_field($field_name); |