? _import.php ? _p_19621_taxosaveobjs.patch ? _p_20505_25termvocab.patch ? _p_20754_bannernames.patch ? _p_23163_bannerurl.patch ? _p_flexinodedivs.patch ? banner_db.php ? banner_file.php ? files ? modules/banner ? modules/devel ? modules/flexinode ? modules/taxonomy_similar ? sites/morbus.totalnetnh.net ? themes/nhpr Index: modules/forum.module =================================================================== RCS file: /cvs/drupal/drupal/modules/forum.module,v retrieving revision 1.255 diff -u -r1.255 forum.module --- modules/forum.module 25 May 2005 06:41:51 -0000 1.255 +++ modules/forum.module 26 May 2005 19:54:23 -0000 @@ -94,7 +94,7 @@ $edit['name'] = 0; } case t('Submit'): - $status = taxonomy_save_term($edit); + list($status, $object) = array_values(taxonomy_save_term($edit)); if (arg(3) == 'container') { $containers = variable_get('forum_containers', array()); $containers[] = $edit['tid']; @@ -290,8 +290,8 @@ // Check to see if a forum vocabulary exists $vid = db_result(db_query("SELECT vid FROM {vocabulary} WHERE module='%s'", 'forum')); if (!$vid) { - $vocabulary = taxonomy_save_vocabulary(array('name' => 'Forums', 'multiple' => 0, 'required' => 1, 'hierarchy' => 1, 'relations' => 0, 'module' => 'forum', 'nodes' => array('forum'))); - $vid = $vocabulary['vid']; + list($status, $object) = array_values(taxonomy_save_vocabulary(array('name' => 'Forums', 'multiple' => 0, 'required' => 1, 'hierarchy' => 1, 'relations' => 0, 'module' => 'forum', 'nodes' => array('forum')))); + $vid = $object['vid']; } variable_set('forum_nav_vocabulary', $vid); } Index: modules/taxonomy.module =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v retrieving revision 1.206 diff -u -r1.206 taxonomy.module --- modules/taxonomy.module 25 May 2005 04:04:59 -0000 1.206 +++ modules/taxonomy.module 26 May 2005 19:54:24 -0000 @@ -163,7 +163,7 @@ cache_clear_all(); - return $status; + return array('status' => $status, 'object' => $edit); } function taxonomy_del_vocabulary($vid) { @@ -301,7 +301,7 @@ cache_clear_all(); - return $status; + return array('status' => $status, 'object' => $edit); } function taxonomy_del_term($tid) { @@ -617,8 +623,8 @@ } if (!$typed_term_tid) { - $new_term = taxonomy_save_term(array('vid' => $vid, 'name' => $typed_term)); - $typed_term_tid = $new_term['tid']; + list($status, $object) = array_values(taxonomy_save_term(array('vid' => $vid, 'name' => $typed_term))); + $typed_term_tid = $object['tid']; } db_query('INSERT INTO {term_node} (nid, tid) VALUES (%d, %d)', $nid, $typed_term_tid); @@ -1166,7 +1172,8 @@ } case t('Submit'): if (arg(3) == 'vocabulary') { - switch (taxonomy_save_vocabulary($edit)) { + list($status, $object) = array_values(taxonomy_save_vocabulary($edit)); + switch ($status) { case SAVED_NEW: drupal_set_message(t('Created new vocabulary %name.', array('%name' => theme('placeholder', $edit['name'])))); break; @@ -1179,7 +1186,8 @@ } } else { - switch (taxonomy_save_term($edit)) { + list($status, $object) = array_values(taxonomy_save_term($edit)); + switch ($status) { case SAVED_NEW: drupal_set_message(t('Created new term %term.', array('%term' => theme('placeholder', $edit['name'])))); break;