? _import.php
? _p_25termvocab.patch
? _p_flexinodedivs.patch
? _p_taxosaveobjs.patch
? files
? modules/devel.module
? modules/flexinode
? modules/taxonomy_similar
? sites/morbus.totalnetnh.net
Index: modules/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum.module,v
retrieving revision 1.252
diff -u -r1.252 forum.module
--- modules/forum.module	7 May 2005 01:48:06 -0000	1.252
+++ modules/forum.module	11 May 2005 16:26:18 -0000
@@ -94,12 +94,12 @@
         $edit['name'] = 0;
       }
     case t('Submit'):
-      $status = taxonomy_save_term($edit);
+      $term_data = taxonomy_save_term($edit);
       if (arg(3) == 'container') {
         $containers = variable_get('forum_containers', array());
         $containers[] = $edit['tid'];
         variable_set('forum_containers', $containers);
-        if ($status == SAVED_NEW) {
+        if ($term_data['status']== SAVED_NEW) {
           drupal_set_message(t('Created new forum container %term.', array('%term' => theme('placeholder', $edit['name']))));
         }
         else {
@@ -107,7 +107,7 @@
         }
       }
       else {
-        if ($status == SAVED_NEW) {
+        if ($term_data['status'] == SAVED_NEW) {
           drupal_set_message(t('Created new forum %term.', array('%term' => theme('placeholder', $edit['name']))));
         }
         else {
@@ -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'];
+      $vocabulary_data = taxonomy_save_vocabulary(array('name' => 'Forums', 'multiple' => 0, 'required' => 1, 'hierarchy' => 1, 'relations' => 0, 'module' => 'forum', 'nodes' => array('forum')));
+      $vid = $vocabulary_data['object']['vid'];
     }
     variable_set('forum_nav_vocabulary', $vid);
   }
Index: modules/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v
retrieving revision 1.200
diff -u -r1.200 taxonomy.module
--- modules/taxonomy.module	7 May 2005 01:48:06 -0000	1.200
+++ modules/taxonomy.module	11 May 2005 16:26:18 -0000
@@ -158,7 +158,7 @@
 
   cache_clear_all();
 
-  return $status;
+  return array('status' => $status, 'object' => $edit);
 }
 
 function taxonomy_del_vocabulary($vid) {
@@ -296,7 +296,7 @@
 
   cache_clear_all();
 
-  return $status;
+  return array('status' => $status, 'object' => $edit);
 }
 
 function taxonomy_del_term($tid) {
@@ -612,8 +618,8 @@
         }
 
         if (!$typed_term_tid) {
-          $new_term = taxonomy_save_term(array('vid' => $vid, 'name' => $typed_term));
-          $typed_term_tid = $new_term['tid'];
+          $term_data = taxonomy_save_term(array('vid' => $vid, 'name' => $typed_term));
+          $typed_term_tid = $term_data['object']['tid'];
         }
 
         db_query('INSERT INTO {term_node} (nid, tid) VALUES (%d, %d)', $nid, $typed_term_tid);
@@ -1158,7 +1164,8 @@
       }
     case t('Submit'):
       if (arg(3) == 'vocabulary') {
-        switch (taxonomy_save_vocabulary($edit)) {
+        $vocabulary_data = taxonomy_save_vocabulary($edit);
+        switch ($vocabulary_data['status']) {
           case SAVED_NEW:
             drupal_set_message(t('Created new vocabulary %name.', array('%name' => theme('placeholder', $edit['name']))));
             break;
@@ -1171,7 +1178,8 @@
         }
       }
       else {
-        switch (taxonomy_save_term($edit)) {
+        $term_data = taxonomy_save_term($edit);
+        switch ($term_data['status']) {
           case SAVED_NEW:
             drupal_set_message(t('Created new term %term.', array('%term' => theme('placeholder', $edit['name']))));
             break;