Index: nodewords.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords.admin.inc,v
retrieving revision 1.1.2.111
diff -u -p -r1.1.2.111 nodewords.admin.inc
--- nodewords.admin.inc	26 Nov 2009 22:24:53 -0000	1.1.2.111
+++ nodewords.admin.inc	26 Nov 2009 23:25:02 -0000
@@ -139,15 +139,8 @@ function nodewords_pages_edit($form_stat
       'fieldset' => FALSE,
     )
   );
-  $result = _nodewords_check_enabled_modules();
-
   if (empty($nodewords_form)) {
-    $bool = (
-      !$result &&
-      !count(array_filter(variable_get('nodewords_edit', array())))
-    );
-
-    if ($bool) {
+    if (!count(array_filter(variable_get('nodewords_edit', array())))) {
       drupal_set_message(
         t(
           'No meta tags have been enabled for editing; enable them on the <a href="@settings_page">settings page</a>.',
@@ -276,14 +269,17 @@ function nodewords_settings_form() {
   $head_tags = variable_get('nodewords_head', array());
   $tags_info = nodewords_get_possible_tags();
 
-  _nodewords_check_enabled_modules();
+  if (!empty($tags_info)) {
+    foreach ($tags_info as $name => $info) {
+      $edit_options[$name] = $head_options[$name] = $info['widget:label'];
+    }
 
-  foreach ($tags_info as $name => $info) {
-    $edit_options[$name] = $head_options[$name] = $info['widget:label'];
+    uasort($edit_options, 'strnatcmp');
+    uasort($head_options, 'strnatcmp');
+  }
+  else {
+    drupal_set_message(t('There are no modules that implement meta tags. You need to enable at least one module between nodewords_basic.module, nodewords_extra.module, and nodewords_verification_tags.module that are listed under <em>Meta tags</em> in the <a href="@modules-page">modules page</a>.', array('@modules-page' => url('admin/build/modules'))), 'error');
   }
-
-  uasort($edit_options, 'strnatcmp');
-  uasort($head_options, 'strnatcmp');
 
   $form['edit'] = array(
     '#type' => 'fieldset',
@@ -292,12 +288,20 @@ function nodewords_settings_form() {
     '#collapsible' => TRUE,
   );
 
-  $form['edit']['nodewords_edit'] = array(
-    '#type' => 'checkboxes',
-    '#options' => $edit_options,
-    '#default_value' => $edit_tags,
-    '#checkall' => TRUE,
-  );
+  if (!empty($tags_info)) {
+    $form['edit']['nodewords_edit'] = array(
+      '#type' => 'checkboxes',
+      '#options' => $edit_options,
+      '#default_value' => $edit_tags,
+      '#checkall' => TRUE,
+    );
+  }
+  else {
+    $form['edit']['nodewords_edit'] = array(
+      '#type' => 'value',
+      '#value' => $edit_tags,
+    );
+  }
 
   $form['head'] = array(
     '#type' => 'fieldset',
@@ -306,12 +310,20 @@ function nodewords_settings_form() {
     '#collapsible' => TRUE,
   );
 
-  $form['head']['nodewords_head'] = array(
-    '#type' => 'checkboxes',
-    '#options' => $head_options,
-    '#default_value' => $head_tags,
-    '#checkall' => TRUE,
-  );
+  if (!empty($tags_info)) {
+    $form['head']['nodewords_head'] = array(
+      '#type' => 'checkboxes',
+      '#options' => $head_options,
+      '#default_value' => $head_tags,
+      '#checkall' => TRUE,
+    );
+  }
+  else {
+    $form['head']['nodewords_head'] = array(
+      '#type' => 'value',
+      '#value' => $head_tags,
+    );
+  }
 
   $form['metatags_creation'] = array(
     '#type' => 'fieldset',
@@ -446,12 +458,9 @@ function nodewords_max_size_validate($el
  */
 function nodewords_tags_form(&$form_state, $type = NODEWORDS_TYPE_DEFAULT, $id = '') {
   $form = array();
-
   $form['#nodewords_type'] = $type;
   $form['#nodewords_id'] = $id;
 
-  $result = _nodewords_check_enabled_modules();
-
   $form['nodewords'] = nodewords_form(
     $type,
     nodewords_load_tags($type, $id),
@@ -461,12 +470,7 @@ function nodewords_tags_form(&$form_stat
   );
 
   if (empty($form['nodewords'])) {
-    $bool = (
-      !$result &&
-      !count(array_filter(variable_get('nodewords_edit', array())))
-    );
-
-    if ($bool) {
+    if (!count(array_filter(variable_get('nodewords_edit', array())))) {
       drupal_set_message(
         t(
           'No meta tags have been enabled for editing; enable them on the <a href="@settings_page">settings page</a>.',
Index: nodewords.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords.install,v
retrieving revision 1.10.2.130
diff -u -p -r1.10.2.130 nodewords.install
--- nodewords.install	23 Nov 2009 08:12:34 -0000	1.10.2.130
+++ nodewords.install	26 Nov 2009 23:25:02 -0000
@@ -16,7 +16,7 @@ function nodewords_requirements($phase) 
     if (!count(module_implements('nodewords_api'))) {
       $requirements['nodewords'] = array(
         'title' => t('Nodewords'),
-        'description' => t('Nodewords does not create meta tags anymore; it is just a module that implements a public API used from the modules that create meta tags. You need to enable at least one module between nodewords_basic.module, nodewords_extra.module, and nodewords_verification_tags.module that are listed under <em>Meta tags</em> in the modules page.'),
+        'description' => t('There are no modules that implement meta tags. You need to enable at least one module between nodewords_basic.module, nodewords_extra.module, and nodewords_verification_tags.module that are listed under <em>Meta tags</em> in the <a href="@modules-page">modules page</a>.', array('@modules-page' => url('admin/build/modules'))),
         'severity' => REQUIREMENT_ERROR,
         'value' => t('Enable the <a href="@url">meta tags modules</a>.', array('@url' => url('admin/build/modules'))),
       );
Index: nodewords.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords.module,v
retrieving revision 1.57.2.253
diff -u -p -r1.57.2.253 nodewords.module
--- nodewords.module	26 Nov 2009 22:24:53 -0000	1.57.2.253
+++ nodewords.module	26 Nov 2009 23:25:03 -0000
@@ -1150,39 +1150,6 @@ function nodewords_unique($text, $separa
  ****************************************************************************/
 
 /**
- * Check the enabled modules, and verify if there are modules implementing meta
- * tags supported by nodewords.module.
- *
- * @return
- *   TRUE if there are modules implementing meta tags.
- */
-function _nodewords_check_enabled_modules() {
-  $result = TRUE;
-  if (user_access('administer site configuration')) {
-    if (!count(module_implements('nodewords_api'))) {
-      drupal_set_message(
-        t(
-          'Nodewords does not create meta tags anymore; it is just a module that implements a public API used from the modules that create meta tags. You need to <a href="@url">enable</a> at least one module between nodewords_basic.module, nodewords_extra.module, and nodewords_verification_tags.module that are listed under <em>Meta tags</em> in the <a href="@url">modules page</a>.',
-          array('@url' => url('admin/build/modules'))
-        ),
-        'error'
-      );
-
-      $result = FALSE;
-    }
-
-    if (module_exists('nodewords_bypath')) {
-      drupal_set_message(
-        t(
-          'The feature implemented in <q>Meta Tags by Path</q> is now included in Nodewords; there is not need to use <q>Meta Tags by Path</q>, and the module should be disabled to avoid possible conflicts. Disable the module in the<a href="@url">modules page</a>.',
-          array('@url' => url('admin/build/modules'))
-        )
-      );
-    }
-  }
-}
-
-/**
  * Try to guess the $type and $ids by looking at $_GET['q'].
  */
 function _nodewords_detect_type_and_ids() {