diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-01-14 21:16:21 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-01-14 21:16:21 +0000 |
| commit | d3df2ff356b0b5802e406de32bbe8727af3128b5 (patch) | |
| tree | db6df37d436e550f8523c21beda5c2b0f6bd251c /modules/node | |
| parent | 534287b1bc054a4141855ce472d3c400af7d6784 (diff) | |
| download | brdo-d3df2ff356b0b5802e406de32bbe8727af3128b5.tar.gz brdo-d3df2ff356b0b5802e406de32bbe8727af3128b5.tar.bz2 | |
- Patch #225562 by Jody Lynn et al: clean up of the taxonomy module SQL table namespace.
Diffstat (limited to 'modules/node')
| -rw-r--r-- | modules/node/node.admin.inc | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc index 090dd5cad..992134b1a 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 {term_node} $table ON n.nid = $table.nid "; + $join .= "INNER JOIN {taxonomy_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 ae638e599..298dd57a4 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 {term_node} tn ON n.vid = tn.vid'; + $join1 .= ' INNER JOIN {taxonomy_term_node} tn ON n.vid = tn.vid'; $keys = search_query_insert($keys, 'term'); } |