Index: nodewords_basic/nodewords_basic.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords_basic/nodewords_basic.module,v
retrieving revision 1.8.2.29
diff -u -p -r1.8.2.29 nodewords_basic.module
--- nodewords_basic/nodewords_basic.module	11 Dec 2009 06:37:21 -0000	1.8.2.29
+++ nodewords_basic/nodewords_basic.module	11 Dec 2009 13:15:14 -0000
@@ -392,7 +392,7 @@ function nodewords_basic_description_for
  * Set the meta tag content.
  */
 function nodewords_basic_description_prepare(&$tags, $content, $options) {
-  if (isset($content['overwrite_default']) ? $content['overwrite_default'] : TRUE) {
+  if (empty($content['overwrite_default'])) {
     $value = $options['default']['description']['value'];
   }
   else {
@@ -720,7 +720,7 @@ function nodewords_basic_robots_prepare(
   if ($options['type'] == NODEWORDS_TYPE_PAGER) {
     $value = variable_get('nodewords_list_robots', array());
   }
-  elseif (isset($content['overwrite_default']) ? $content['overwrite_default'] : TRUE) {
+  elseif (!empty($content['overwrite_default'])) {
     $value = !empty($content['value']) ? $content['value'] : array();
   }
   else {
Index: nodewords_extra/nodewords_extra.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords_extra/nodewords_extra.module,v
retrieving revision 1.7.2.15
diff -u -p -r1.7.2.15 nodewords_extra.module
--- nodewords_extra/nodewords_extra.module	11 Dec 2009 06:37:25 -0000	1.7.2.15
+++ nodewords_extra/nodewords_extra.module	11 Dec 2009 13:15:14 -0000
@@ -85,7 +85,6 @@ function nodewords_extra_nodewords_tags_
       'label:lists' => t('Dublin Core date'),
       'label:lists:edit' => t('Date'),
       'tag:context:allowed' => array(
-        NODEWORDS_TYPE_DEFAULT,
         NODEWORDS_TYPE_NODE,
         NODEWORDS_TYPE_PAGE,
       ),
@@ -254,7 +253,7 @@ function nodewords_extra_dc_contributor_
  * Set the meta tag content.
  */
 function nodewords_extra_dc_contributor_prepare(&$tags, $content, $options) {
-  if (isset($content['overwrite_default']) ? $content['overwrite_default'] : TRUE) {
+  if (!empty($content['overwrite_default'])) {
     if (!empty($content['value'])) {
       $tags['dc.contributor'] = nodewords_replace_tokens($content['value'], $options);
     }
@@ -263,18 +262,19 @@ function nodewords_extra_dc_contributor_
     if (!empty($options['default']['dc.contributor']['value'])) {
       $tags['dc.contributor'] = nodewords_replace_tokens($options['default']['dc.contributor']['value'], $options);
     }
-  }
-  if (empty($tags['dc.contributor'])) {
-    if ($options['type'] == NODEWORDS_TYPE_NODE) {
-      $bool = (
-        ($node = node_load(array('nid' => $options['id'], 'vid' => $options['sid']))) &&
-        ($uid = $node->uid) &&
-        ($user = user_load($uid)) &&
-        $user->name
-      );
 
-      if ($bool) {
-        $tags['dc.contributor'] = $user->name;
+    if (empty($tags['dc.contributor'])) {
+      if ($options['type'] == NODEWORDS_TYPE_NODE) {
+        $bool = (
+          ($node = node_load(array('nid' => $options['id'], 'vid' => $options['sid']))) &&
+          ($uid = $node->uid) &&
+          ($user = user_load($uid)) &&
+          $user->name
+        );
+
+        if ($bool) {
+          $tags['dc.contributor'] = $user->name;
+        }
       }
     }
   }
@@ -319,7 +319,7 @@ function nodewords_extra_dc_creator_form
  * Set the meta tag content.
  */
 function nodewords_extra_dc_creator_prepare(&$tags, $content, $options) {
-  if (isset($content['overwrite_default']) ? $content['overwrite_default'] : TRUE) {
+  if (!empty($content['overwrite_default'])) {
     if (!empty($content['value'])) {
       $tags['dc.creator'] = nodewords_replace_tokens($content['value'], $options);
     }
@@ -383,7 +383,7 @@ function nodewords_extra_dc_date_form(&$
  */
 function nodewords_extra_dc_date_prepare(&$tags, $content, $options) {
 
-  if (isset($content['overwrite_default']) ? $content['overwrite_default'] : TRUE) {
+  if (empty($content['overwrite_default'])) {
     $time = time();
   }
   else {
@@ -505,7 +505,7 @@ function nodewords_extra_dc_publisher_fo
  * Set the meta tag content.
  */
 function nodewords_extra_dc_publisher_prepare(&$tags, $content, $options) {
-  if (isset($content['overwrite_default']) ? $content['overwrite_default'] : TRUE) {
+  if (!empty($content['overwrite_default'])) {
     if (!empty($content['value'])) {
       $tags['dc.publisher'] = nodewords_replace_tokens($content['value'], $options);
     }
@@ -514,18 +514,19 @@ function nodewords_extra_dc_publisher_pr
     if (!empty($options['default']['dc.publisher']['value'])) {
       $tags['dc.creator'] = nodewords_replace_tokens($options['default']['dc.publisher']['value'], $options);
     }
-  }
-  if (empty($tags['dc.creator'])) {
-    if ($options['type'] == NODEWORDS_TYPE_NODE) {
-      $bool = (
-        ($node = node_load(array('nid' => $options['id'], 'vid' => $options['sid']))) &&
-        ($uid = $node->uid) &&
-        ($user = user_load($uid)) &&
-        $user->name
-      );
 
-      if ($bool) {
-        $tags['dc.publisher'] = $user->name;
+    if (empty($tags['dc.creator'])) {
+      if ($options['type'] == NODEWORDS_TYPE_NODE) {
+        $bool = (
+          ($node = node_load(array('nid' => $options['id'], 'vid' => $options['sid']))) &&
+          ($uid = $node->uid) &&
+          ($user = user_load($uid)) &&
+          $user->name
+        );
+
+        if ($bool) {
+          $tags['dc.publisher'] = $user->name;
+        }
       }
     }
   }
@@ -570,7 +571,7 @@ function nodewords_extra_dc_title_form(&
  * Set the meta tag content.
  */
 function nodewords_extra_dc_title_prepare(&$tags, $content, $options) {
-  if (isset($content['overwrite_default']) ? $content['overwrite_default'] : TRUE) {
+  if (!empty($content['overwrite_default'])) {
     if (!empty($content['value'])) {
       $tags['dc.creator'] = nodewords_replace_tokens($content['value'], $options);
     }
@@ -631,7 +632,7 @@ function nodewords_extra_location_form(&
  * Set the meta tag content.
  */
 function nodewords_extra_location_prepare(&$tags, $content, $options) {
-  if (isset($content['overwrite_default']) ? $content['overwrite_default'] : TRUE) {
+  if (!empty($content['overwrite_default'])) {
     if (!empty($content['latitude']) && !empty($content['longitude'])) {
       $tags['location:geo.position'] = $content['latitude'] . ';' . $content['longitude'];
       $tags['location:icbm'] = $content['latitude'] . ',' . $content['longitude'];
@@ -717,7 +718,7 @@ function nodewords_extra_pics_form(&$for
  * Set the meta tag content.
  */
 function nodewords_extra_pics_prepare(&$tags, $content, $options) {
-  if (isset($content['overwrite_default']) ? $content['overwrite_default'] : TRUE) {
+  if (!empty($content['overwrite_default'])) {
     $value = $content['value'];
   }
   else {