? cvs_get_vanilla.sh
? sites/default/settings.php.new
Index: modules/blogapi.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi.module,v
retrieving revision 1.39.2.11
diff -u -p -r1.39.2.11 blogapi.module
--- modules/blogapi.module	30 Nov 2005 10:05:16 -0000	1.39.2.11
+++ modules/blogapi.module	16 Feb 2006 19:16:02 -0000
@@ -186,12 +186,12 @@ function blogapi_blogger_new_post($appke
   $node_type_default = variable_get('node_options_'. $edit['type'], array('status', 'promote'));
   $edit['uid'] = $user->uid;
   $edit['name'] = $user->name;
-  $edit['promote'] = in_array('promote', $node_type_default);
+  $edit['promote'] = (int) in_array('promote', $node_type_default);
   $edit['comment'] = variable_get('comment_'. $edit['type'], 2);
-  $edit['moderate'] = in_array('moderate', $node_type_default);
+  $edit['moderate'] = (int) in_array('moderate', $node_type_default);
   $edit['revision'] = in_array('revision', $node_type_default);
   $edit['format'] = FILTER_FORMAT_DEFAULT;
-  $edit['status'] = $publish;
+  $edit['status'] = (int) $publish;
 
   // check for bloggerAPI vs. metaWeblogAPI
   if (is_array($content)) {
@@ -246,7 +246,7 @@ function blogapi_blogger_edit_post($appk
     return blogapi_error(message_access());
   }
 
-  $node->status = $publish;
+  $node->status = (int) $publish;
 
   // check for bloggerAPI vs. metaWeblogAPI
   if (is_array($content)) {
@@ -663,7 +663,7 @@ function _blogapi_mt_extra(&$node, $stru
 
   // mt_convert_breaks
   if ($struct['mt_convert_breaks']) {
-    $node->format = $struct['mt_convert_breaks'];
+    $node->format = (int) $struct['mt_convert_breaks'];
   }
 
   // dateCreated
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.485.2.14
diff -u -p -r1.485.2.14 node.module
--- modules/node.module	9 Sep 2005 06:14:24 -0000	1.485.2.14
+++ modules/node.module	16 Feb 2006 19:16:03 -0000
@@ -1047,7 +1047,7 @@ function node_revision_rollback($nid, $r
       $filter[] = $key;
     }
 
-    node_save($rev, $filter);
+    node_save($rev);
 
     drupal_set_message(t('Rolled back to revision %revision of %title', array('%revision' => "<em>#$revision</em>", '%title' => theme('placeholder', $node->title))));
     drupal_goto('node/'. $nid .'/revisions');
@@ -1063,7 +1063,7 @@ function node_revision_delete($nid, $rev
 
     unset($node->revisions[$revision]);
 
-    node_save($node, array('nid', 'revisions'));
+    node_save($node);
 
     drupal_set_message(t('Deleted revision %revision of %title', array('%revision' => "<em>#$revision</em>", '%title' => theme('placeholder', $node->title))));
     drupal_goto('node/'. $nid . (count($node->revisions) ? '/revisions' : ''));
@@ -1247,10 +1247,10 @@ function node_validate($node) {
     $node->uid = $user->uid ? $user->uid : 0;
     // Force defaults in case people modify the form:
     $node_options = variable_get('node_options_'. $node->type, array('status', 'promote'));
-    $node->status = in_array('status', $node_options);
-    $node->moderate = in_array('moderate', $node_options);
-    $node->promote = in_array('promote', $node_options);
-    $node->sticky = in_array('sticky', $node_options);
+    $node->status = (int) in_array('status', $node_options);
+    $node->moderate = (int) in_array('moderate', $node_options);
+    $node->promote = (int) in_array('promote', $node_options);
+    $node->sticky = (int) in_array('sticky', $node_options);
     $node->revision = in_array('revision', $node_options);
     unset($node->created);
   }