=== modified file 'modules/views/views_rss.module'
--- modules/views/views_rss.module      2008-05-07 14:37:56 +0000
+++ modules/views/views_rss.module      2008-11-18 16:21:26 +0000
@@ -151,13 +151,23 @@
 
     // Allow modules to add additional item fields
     $extra = node_invoke_nodeapi($item, 'rss item');
-    $extra = array_merge($extra, array(array('key' => 'pubDate', 'value' =>  date('r', $item->created)), array('key' => 'dc:creator', 'value' => $item->name), array('key' => 'guid', 'value' => $item->nid . ' at ' . $base_url, 'attributes' => array('isPermaLink' => 'false'))));
-    foreach ($extra as $element) {
-      if ($element['namespace']) {
-        $namespaces = array_merge($namespaces, $element['namespace']);
-      }
-    }
-    
+    $feed_elements = variable_get('feed_include_elements', 'all');
+    if($feed_elements === "all") {
+      $extra = array_merge($extra,
+                           array(array('key' => 'dc:creator',
+                                       'value' => $item->name)));
+    }
+    if($feed_elements === "all" || $feed_elements === "date") {
+      $extra = array_merge($extra,
+                           array(array('key' => 'pubDate',
+                                       'value' =>  date('r', $item->created))));
+    }
+    $extra = array_merge($extra,
+                         array(array('key' => 'guid',
+                                     'value' => $item->nid .' at '. $base_url,
+                                     'attributes' =>
+                                     array('isPermaLink' => 'false'))));
+
     // Prepare the item description
     switch ($item_length) {
       case 'fulltext':