# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: sites/all/modules/contrib/taxonomyblocks # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: taxonomyblocks.module --- taxonomyblocks.module Base (BASE) +++ taxonomyblocks.module Locally Modified (Based On LOCAL) @@ -631,7 +631,7 @@ * Returns NULL if False. */ function term_has_nodes($tid) { - $nid = db_result(db_query("SELECT tn.nid FROM {term_node} tn, {node} n WHERE tn.tid = %d AND n.nid = tn.nid AND n.status = 1 ", $tid)); + $nid = db_result(db_query("SELECT tn.nid FROM {term_node} tn, {node} n WHERE tn.tid = %d AND n.nid = tn.nid AND n.status = 1 AND n.vid = tn.vid", $tid)); return $nid; } /** @@ -703,14 +703,14 @@ } $tree[$termname]['link']['href'] = $path; if ($nodecounter == 'all') { - $count = db_result(db_query("SELECT COUNT(tn.nid) FROM {term_node} tn, {node} n WHERE tn.tid = %d AND n.nid = tn.nid AND n.status = 1", $tid)); + $count = db_result(db_query("SELECT COUNT(tn.nid) FROM {term_node} tn, {node} n WHERE tn.tid = %d AND n.nid = tn.nid AND n.status = 1 AND n.vid = tn.vid", $tid)); $tree[$termname]['link']['title'] = $termname .' ('. $count .')'; } if ($nodecounter == 'none') { $tree[$termname]['link']['title'] = $termname ; } if ($nodecounter != 'all' && $nodecounter != 'none') { - $count = db_result(db_query("SELECT COUNT(tn.nid) FROM {term_node} tn, {node} n WHERE tn.tid = %d AND n.nid = tn.nid AND n.type = '%s' AND n.status = 1", $tid, $nodecounter)); \ No newline at end of file + $count = db_result(db_query("SELECT COUNT(tn.nid) FROM {term_node} tn, {node} n WHERE tn.tid = %d AND n.nid = tn.nid AND n.type = '%s' AND n.status = 1 AND n.vid = tn.vid", $tid, $nodecounter)); \ No newline at end of file $tree[$termname]['link']['title'] = $termname .' ('. $count .')'; } if (empty($titlepattern)) {