? 259368-2.patch
? 259368-3.patch
? 328781-drupal-log-behave_4.patch
? admin_content_node_0.patch
? block-module-db-rewrite.patch
? cron_error.patch
? cron_error.patch.1
? d6.sql
? d7.timezone31.patch
? form_23.patch
? http_case_insensitive_fields.patch
? input_format_1.patch
? jquery_124_update.patch
? js_filter_xss.patch
? module-list-2.patch
? multiple_load.patch
? multiple_load2.patch
? multiple_load3.patch
? multiple_load_3.patch
? node-content_type_overview-302120-19.patch
? node_multiple_load.patch
? node_multiple_load.test
? node_multiple_load_2.patch
? schema_test.patch
? search_result_node_info_10.patch
? simple.patch
? simpletest_message_filtering_06.patch
? taxonomy-trim_0.patch
? taxonomy-trim_1.patch
? term_hooks_update.patch
? term_multiple_load_0.patch
? term_objects.patch
? update_d6_d7_2.patch
? vocabulary_hooks.patch
? whoops.patch
? includes/.bootstrap.inc.swp
? modules/node/node.sql_search.inc
? modules/simpletest/tests/schema.test
? modules/taxonomy/multiple_load2.patch
? modules/user/user.sql_search.inc
? sites/all/modules
? sites/default/files
? sites/default/settings.php
Index: modules/taxonomy/taxonomy.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v
retrieving revision 1.35
diff -u -p -r1.35 taxonomy.admin.inc
--- modules/taxonomy/taxonomy.admin.inc	5 Nov 2008 14:08:11 -0000	1.35
+++ modules/taxonomy/taxonomy.admin.inc	6 Nov 2008 21:45:55 -0000
@@ -513,7 +513,8 @@ function taxonomy_overview_terms_submit(
   }
 
   // Save all updated terms.
-  foreach ($changed_terms as $term) {
+  foreach ($changed_terms as $changed) {
+    $term = (object) $changed;
     taxonomy_term_save($term);
   }
 
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.438
diff -u -p -r1.438 taxonomy.module
--- modules/taxonomy/taxonomy.module	5 Nov 2008 14:08:11 -0000	1.438
+++ modules/taxonomy/taxonomy.module	6 Nov 2008 21:45:59 -0000
@@ -352,7 +352,7 @@ function taxonomy_term_save($term) {
     }
   }
   else {
-    db_insert('term_hierarchy')->field(array('tid' => $term_tid, 'parent' => $term->parent))->execute();
+    db_insert('term_hierarchy')->fields(array('tid' => $term_tid, 'parent' => $term->parent))->execute();
   }
 
   db_delete('term_synonym')->condition('tid', $term->tid)->execute();
@@ -676,8 +676,9 @@ function taxonomy_node_save($node, $term
 
         if (!$typed_term_tid) {
           $edit = array('vid' => $vid, 'name' => $typed_term);
-          $status = taxonomy_term_save($edit);
-          $typed_term_tid = $edit['tid'];
+          $term = (object) $edit;
+          $status = taxonomy_term_save($term);
+          $typed_term_tid = $term->tid;
         }
 
         // Defend against duplicate, differently cased tags