@@ -584,7 +584,7 @@ function blogapi_mt_validate_terms($node) {
$term_list=array_unique($node->taxonomy);
$params=$term_list;
$params[]=$node->type;
$result=db_query(db_rewrite_sql("SELECT t.tid, t.vid FROM {term_data} t INNER JOIN {vocabulary_node_type} n ON t.vid = n.vid WHERE t.tid IN (".db_placeholders($term_list).") AND n.type = '%s'",'t','tid'),$params);
$result=db_query(db_rewrite_sql("SELECT t.tid, t.vid FROM {taxonomy_term_data} t INNER JOIN {taxonomy_vocabulary_node_type} n ON t.vid = n.vid WHERE t.tid IN (".db_placeholders($term_list).") AND n.type = '%s'",'t','tid'),$params);
$found_terms=array();
$found_count=0;
while($term=db_fetch_object($result)){
...
...
@@ -597,7 +597,7 @@ function blogapi_mt_validate_terms($node) {
}
}
// Look up all the vocabularies for this node type.
$result2=db_query(db_rewrite_sql("SELECT v.vid, v.name, v.required, v.multiple FROM {vocabulary} v INNER JOIN {vocabulary_node_type} n ON v.vid = n.vid WHERE n.type = '%s'",'v','vid'),$node->type);
$result2=db_query(db_rewrite_sql("SELECT v.vid, v.name, v.required, v.multiple FROM {taxonomy_vocabulary} v INNER JOIN {taxonomy_vocabulary_node_type} n ON v.vid = n.vid WHERE n.type = '%s'",'v','vid'),$node->type);
// Check each vocabulary associated with this node type.
while($vocabulary=db_fetch_object($result2)){
// Required vocabularies must have at least one term.
* An associative array containing the term data or FALSE if the term cannot be loaded, or is not part of the forum vocabulary.
*/
functionforum_term_load($tid){
$result=db_query(db_rewrite_sql('SELECT t.tid, t.vid, t.name, t.description, t.weight FROM {term_data} t WHERE t.tid = %d AND t.vid = %d','t','tid'),$tid,variable_get('forum_nav_vocabulary',''));
$result=db_query(db_rewrite_sql('SELECT t.tid, t.vid, t.name, t.description, t.weight FROM {taxonomy_term_data} t WHERE t.tid = %d AND t.vid = %d','t','tid'),$tid,variable_get('forum_nav_vocabulary',''));
returndb_fetch_array($result);
}
...
...
@@ -250,7 +250,7 @@ function forum_nodeapi_validate($node, $form) {
if(db_result(db_query('SELECT COUNT(*) FROM {term_data} WHERE tid = %d AND vid = %d',$term,$vocabulary))){
if(db_result(db_query('SELECT COUNT(*) FROM {taxonomy_term_data} WHERE tid = %d AND vid = %d',$term,$vocabulary))){
if(in_array($term,$containers)){
$term=taxonomy_term_load($term);
form_set_error('taxonomy',t('The item %forum is only a container for forums. Please select one of the forums below it.',array('%forum'=>$term->name)));
...
...
@@ -283,7 +283,7 @@ function forum_nodeapi_presave($node) {
$node->tid=$term_id;
}
}
$old_tid=db_result(db_query_range("SELECT t.tid FROM {term_node} t INNER JOIN {node} n ON t.vid = n.vid WHERE n.nid = %d ORDER BY t.vid DESC",$node->nid,0,1));
$old_tid=db_result(db_query_range("SELECT t.tid FROM {taxonomy_term_node} t INNER JOIN {node} n ON t.vid = n.vid WHERE n.nid = %d ORDER BY t.vid DESC",$node->nid,0,1));
@@ -521,7 +521,7 @@ function forum_block_view($delta = '') {
case'new':
$title=t('New forum topics');
$sql=db_rewrite_sql("SELECT n.nid, n.title, l.comment_count FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid INNER JOIN {term_data} td ON td.tid = tn.tid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 AND td.vid = %d ORDER BY n.nid DESC");
$sql=db_rewrite_sql("SELECT n.nid, n.title, l.comment_count FROM {node} n INNER JOIN {taxonomy_term_node} tn ON tn.vid = n.vid INNER JOIN {taxonomy_term_data} td ON td.tid = tn.tid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 AND td.vid = %d ORDER BY n.nid DESC");
@@ -588,7 +588,7 @@ function forum_get_forums($tid = 0) {
$counts=array();
$sql="SELECT r.tid, COUNT(n.nid) AS topic_count, SUM(l.comment_count) AS comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {term_node} r ON n.vid = r.vid WHERE n.status = 1 GROUP BY r.tid";
$sql="SELECT r.tid, COUNT(n.nid) AS topic_count, SUM(l.comment_count) AS comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {taxonomy_term_node} r ON n.vid = r.vid WHERE n.status = 1 GROUP BY r.tid";
$sql=db_rewrite_sql($sql);
$_counts=db_query($sql);
while($count=db_fetch_object($_counts)){
...
...
@@ -613,7 +613,7 @@ function forum_get_forums($tid = 0) {
// This query does not use full ANSI syntax since MySQL 3.x does not support
// table1 INNER JOIN table2 INNER JOIN table3 ON table2_criteria ON table3_criteria
// used to join node_comment_statistics to users.
$sql="SELECT ncs.last_comment_timestamp, IF (ncs.last_comment_uid != 0, u2.name, ncs.last_comment_name) AS last_comment_name, ncs.last_comment_uid FROM {node} n INNER JOIN {users} u1 ON n.uid = u1.uid INNER JOIN {term_node} tn ON n.vid = tn.vid INNER JOIN {node_comment_statistics} ncs ON n.nid = ncs.nid INNER JOIN {users} u2 ON ncs.last_comment_uid=u2.uid WHERE n.status = 1 AND tn.tid = %d ORDER BY ncs.last_comment_timestamp DESC";
$sql="SELECT ncs.last_comment_timestamp, IF (ncs.last_comment_uid != 0, u2.name, ncs.last_comment_name) AS last_comment_name, ncs.last_comment_uid FROM {node} n INNER JOIN {users} u1 ON n.uid = u1.uid INNER JOIN {taxonomy_term_node} tn ON n.vid = tn.vid INNER JOIN {node_comment_statistics} ncs ON n.nid = ncs.nid INNER JOIN {users} u2 ON ncs.last_comment_uid=u2.uid WHERE n.status = 1 AND tn.tid = %d ORDER BY ncs.last_comment_timestamp DESC";
@@ -636,7 +636,7 @@ function forum_get_forums($tid = 0) {
* than NODE_NEW_LIMIT.
*/
function_forum_topics_unread($term,$uid){
$sql="SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} tn ON n.vid = tn.vid AND tn.tid = %d LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d WHERE n.status = 1 AND n.created > %d AND h.nid IS NULL";
$sql="SELECT COUNT(n.nid) FROM {node} n INNER JOIN {taxonomy_term_node} tn ON n.vid = tn.vid AND tn.tid = %d LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d WHERE n.status = 1 AND n.created > %d AND h.nid IS NULL";
@@ -659,11 +659,11 @@ function forum_get_topics($tid, $sortby, $forum_per_page) {
}
}
$sql=db_rewrite_sql("SELECT n.nid, r.tid, n.title, n.type, n.sticky, u.name, u.uid, n.created AS timestamp, n.comment AS comment_mode, l.last_comment_timestamp, IF(l.last_comment_uid != 0, cu.name, l.last_comment_name) AS last_comment_name, l.last_comment_uid, l.comment_count AS num_comments, f.tid AS forum_tid FROM {node_comment_statistics} l INNER JOIN {node} n ON n.nid = l.nid INNER JOIN {users} cu ON l.last_comment_uid = cu.uid INNER JOIN {term_node} r ON n.vid = r.vid INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {forum} f ON n.vid = f.vid WHERE n.status = 1 AND r.tid = %d");
$sql=db_rewrite_sql("SELECT n.nid, r.tid, n.title, n.type, n.sticky, u.name, u.uid, n.created AS timestamp, n.comment AS comment_mode, l.last_comment_timestamp, IF(l.last_comment_uid != 0, cu.name, l.last_comment_name) AS last_comment_name, l.last_comment_uid, l.comment_count AS num_comments, f.tid AS forum_tid FROM {node_comment_statistics} l INNER JOIN {node} n ON n.nid = l.nid INNER JOIN {users} cu ON l.last_comment_uid = cu.uid INNER JOIN {taxonomy_term_node} r ON n.vid = r.vid INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {forum} f ON n.vid = f.vid WHERE n.status = 1 AND r.tid = %d");
@@ -954,7 +954,7 @@ function template_preprocess_forum_topic_navigation(&$variables) {
$output='';
// get previous and next topic
$sql="SELECT n.nid, n.title, n.sticky, l.comment_count, l.last_comment_timestamp FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {term_node} r ON n.nid = r.nid AND r.tid = %d WHERE n.status = 1 ORDER BY n.sticky DESC, "._forum_get_topic_order_sql(variable_get('forum_order',1));
$sql="SELECT n.nid, n.title, n.sticky, l.comment_count, l.last_comment_timestamp FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {taxonomy_term_node} r ON n.nid = r.nid AND r.tid = %d WHERE n.status = 1 ORDER BY n.sticky DESC, "._forum_get_topic_order_sql(variable_get('forum_order',1));
@@ -149,7 +149,7 @@ class ForumTestCase extends DrupalWebTestCase {
*
* @param string $type Forum type (forum container or forum).
* @param integer $parent Forum parent (default = 0 = a root forum; >0 = a forum container or another forum).
* @return object Term_data created.
* @return object Taxonomy_term_data created.
*/
functioncreateForum($type,$parent=0){
// Generate a random name/description.
...
...
@@ -170,12 +170,12 @@ class ForumTestCase extends DrupalWebTestCase {
$this->assertRaw(t('Created new @type %term.',array('%term'=>$name,'@type'=>t($type))),t(ucfirst($type).' was created'));
// Verify forum.
$term=db_fetch_array(db_query("SELECT * FROM {term_data} t WHERE t.vid = %d AND t.name = '%s' AND t.description = '%s'",variable_get('forum_nav_vocabulary',''),$name,$description));
$term=db_fetch_array(db_query("SELECT * FROM {taxonomy_term_data} t WHERE t.vid = %d AND t.name = '%s' AND t.description = '%s'",variable_get('forum_nav_vocabulary',''),$name,$description));
$this->assertTrue(!empty($term),'The '.$type.' exists in the database');
// Verify forum hierarchy.
$tid=$term['tid'];
$parent_tid=db_result(db_query("SELECT t.parent FROM {term_hierarchy} t WHERE t.tid = %d",$tid));
$parent_tid=db_result(db_query("SELECT t.parent FROM {taxonomy_term_hierarchy} t WHERE t.tid = %d",$tid));
$this->assertTrue($parent==$parent_tid,'The '.$type.' is linked to its container');
return$term;
...
...
@@ -322,7 +322,7 @@ class ForumTestCase extends DrupalWebTestCase {
/**
* Verify display of forum page.
*
* @param array $forum Forum array (a row from term_data table).
* @param array $forum Forum array (a row from taxonomy_term_data table).
@@ -271,8 +271,8 @@ function taxonomy_overview_terms(&$form_state, $vocabulary) {
if($vocabulary->tags){
// We are not calling taxonomy_get_tree because that might fail with a big
// number of tags in the freetagging vocabulary.
$results=pager_query(db_rewrite_sql('SELECT t.*, h.parent FROM {term_data} t INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE t.vid = %d ORDER BY weight, name','t','tid'),$page_increment,0,NULL,$vocabulary->vid);
$total_entries=db_query(db_rewrite_sql('SELECT count(*) FROM {term_data} t INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE t.vid = :vid'),array(':vid'=>$vocabulary->vid));
$results=pager_query(db_rewrite_sql('SELECT t.*, h.parent FROM {taxonomy_term_data} t INNER JOIN {taxonomy_term_hierarchy} h ON t.tid = h.tid WHERE t.vid = %d ORDER BY weight, name','t','tid'),$page_increment,0,NULL,$vocabulary->vid);
$total_entries=db_query(db_rewrite_sql('SELECT count(*) FROM {taxonomy_term_data} t INNER JOIN {taxonomy_term_hierarchy} h ON t.tid = h.tid WHERE t.vid = :vid'),array(':vid'=>$vocabulary->vid));
while($term=db_fetch_object($results)){
$key='tid:'.$term->tid.':0';
$current_page[$key]=$term;
...
...
@@ -909,7 +909,7 @@ function taxonomy_vocabulary_confirm_reset_alphabetical(&$form_state, $vid) {
$result=db_query(db_rewrite_sql('SELECT t.tid, t.name FROM {term_data} t WHERE t.tid IN ('.db_placeholders($terms['tids']).')','t','tid'),$terms['tids']);
$result=db_query(db_rewrite_sql('SELECT t.tid, t.name FROM {taxonomy_term_data} t WHERE t.tid IN ('.db_placeholders($terms['tids']).')','t','tid'),$terms['tids']);
$tids=array();// we rebuild the $tids-array so it only contains terms the user has access to.
$names=array();
while($term=db_fetch_object($result)){
...
...
@@ -131,7 +131,7 @@ function taxonomy_autocomplete($vid, $string = '') {
$last_string=trim(array_pop($array));
$matches=array();
if($last_string!=''){
$result=db_query_range(db_rewrite_sql("SELECT t.tid, t.name FROM {term_data} t WHERE t.vid = :vid AND LOWER(t.name) LIKE LOWER(:last_string)",'t','tid'),array(
$result=db_query_range(db_rewrite_sql("SELECT t.tid, t.name FROM {taxonomy_term_data} t WHERE t.vid = :vid AND LOWER(t.name) LIKE LOWER(:last_string)",'t','tid'),array(