summaryrefslogtreecommitdiff
path: root/modules/node
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-01-13 22:41:39 +0000
committerDries Buytaert <dries@buytaert.net>2009-01-13 22:41:39 +0000
commit77936aef4c487e8b3265cb28e72d104004cb1172 (patch)
treed2dbc969ff08f968f248ccedb39dc846950e3480 /modules/node
parentbe36b9205e25595f5e4bf0dba4de33f5f620b33e (diff)
downloadbrdo-77936aef4c487e8b3265cb28e72d104004cb1172.tar.gz
brdo-77936aef4c487e8b3265cb28e72d104004cb1172.tar.bz2
- Rollback of #225562 -- I think there is still something wrong.
Diffstat (limited to 'modules/node')
-rw-r--r--modules/node/node.admin.inc2
-rw-r--r--modules/node/node.module2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index 992134b1a..090dd5cad 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -184,7 +184,7 @@ function node_build_filter_query() {
case 'term':
$table = "tn$index";
$where[] = "$table.tid = %d";
- $join .= "INNER JOIN {taxonomy_term_node} $table ON n.nid = $table.nid ";
+ $join .= "INNER JOIN {term_node} $table ON n.nid = $table.nid ";
break;
case 'type':
$where[] = "n.type = '%s'";
diff --git a/modules/node/node.module b/modules/node/node.module
index 298dd57a4..ae638e599 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1373,7 +1373,7 @@ function node_search($op = 'search', $keys = NULL) {
$arguments1[] = $c;
}
$conditions1 .= ' AND (' . implode(' OR ', $terms) . ')';
- $join1 .= ' INNER JOIN {taxonomy_term_node} tn ON n.vid = tn.vid';
+ $join1 .= ' INNER JOIN {term_node} tn ON n.vid = tn.vid';
$keys = search_query_insert($keys, 'term');
}