From d3df2ff356b0b5802e406de32bbe8727af3128b5 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 14 Jan 2009 21:16:21 +0000
Subject: - Patch #225562 by Jody Lynn et al: clean up of the taxonomy module
 SQL table namespace.

---
 modules/node/node.admin.inc | 2 +-
 modules/node/node.module    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/node')

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');
       }
 
-- 
cgit v1.2.3