Index: simplenews.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simplenews/simplenews.install,v
retrieving revision 1.8.2.25
diff -u -p -r1.8.2.25 simplenews.install
--- simplenews.install	13 Aug 2009 15:14:09 -0000	1.8.2.25
+++ simplenews.install	24 Oct 2009 16:13:25 -0000
@@ -243,7 +243,7 @@ function _simplenews_install_vocabulary(
     $vocabulary = array(
       'name' => t('Newsletter'),
       'multiple' => '0',
-      'required' => '0',
+      'required' => '1',
       'hierarchy' => '0',
       'relations' => '0',
       'module' => 'simplenews',
Index: simplenews.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simplenews/simplenews.module,v
retrieving revision 1.76.2.136
diff -u -p -r1.76.2.136 simplenews.module
--- simplenews.module	9 Sep 2009 13:32:06 -0000	1.76.2.136
+++ simplenews.module	24 Oct 2009 16:13:27 -0000
@@ -495,8 +495,16 @@ function simplenews_form_alter(&$form, $
       '#value' => t('This is the designated simplenews vocabulary.'),
       '#weight' => -1,
     );
-    $form['content_types']['nodes']['#disabled'] = TRUE;
-    $form['content_types']['nodes']['#description'] = t('These content type(s) are used as newsletter. They can also be set in !simplenews_settings.', array('!simplenews_settings' => l('Simplenews settings', 'admin/settings/simplenews')));
+    // We display the current content type settings in a disabled form element
+    // to the user. The real value passed in the form separately because
+    // disabled elements do not get saved at submit.
+    $form['content_types']['display_only'] = $form['content_types']['nodes'];
+    $form['content_types']['display_only']['#disabled'] = TRUE;
+    $form['content_types']['display_only']['#description'] = t('These content type(s) are used as newsletter. They can be set in !simplenews_settings.', array('!simplenews_settings' => l('Simplenews settings', 'admin/settings/simplenews')));
+    $form['content_types']['nodes'] = array(
+      '#type' => 'value',
+      '#value' => $form['content_types']['nodes']['#default_value'],
+    );
     // Free tagging can not be allowed see: simplenews_validate_taxonomy().
     $form['settings']['tags'] = array('#type' => 'value', '#value' => FALSE);
     // Multiple select does not work with simplenews.