? translations
Index: simplenews.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simplenews/simplenews.module,v
retrieving revision 1.199
diff -u -p -r1.199 simplenews.module
--- simplenews.module	29 Jan 2009 18:36:26 -0000	1.199
+++ simplenews.module	30 Jan 2009 08:53:56 -0000
@@ -372,6 +372,7 @@ function simplenews_nodeapi(&$node, $op,
       }
       break;
     case 'presave':
+      $node->simplenews = array_merge(_simplenews_get_node_form_defaults(), is_array($node->simplenews) ? $node->simplenews : array());
       $term = simplenews_validate_taxonomy($node->taxonomy);
       $tid = is_array($term) ? array_values($term) : FALSE;
       $node->simplenews['tid'] = $tid ? $tid[0] : 0;
@@ -2278,6 +2279,23 @@ function _simplenews_measure_usec($start
 }
 
 /**
+ * Get defaults for the simplenews node form.
+ */
+function _simplenews_get_node_form_defaults() {
+  $defaults = array(
+    'advanced' => array(
+      's_format' => variable_get('simplenews_format', 'plain'),
+      'priority' => variable_get('simplenews_priority', SIMPLENEWS_PRIORITY_NONE),
+      'receipt' => variable_get('simplenews_receipt', 0),
+    ),
+    'send' => user_access('send newsletter') ? variable_get('simplenews_send', SIMPLENEWS_COMMAND_SEND_NONE) : SIMPLENEWS_COMMAND_SEND_NONE,
+    's_status' => '0',
+    'test_address' => variable_get('simplenews_test_address', variable_get('site_mail', ini_get('sendmail_from'))),
+  );
+  return $defaults;
+}
+
+/**
  * Implementation of hook_content_build_modes().
  */
 function simplenews_content_build_modes() {
