Index: includes/admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/admin.inc,v
retrieving revision 1.126
diff -u -F^[^a-z]*function -r1.126 admin.inc
--- includes/admin.inc	28 Jul 2008 22:08:33 -0000	1.126
+++ includes/admin.inc	29 Jul 2008 13:53:48 -0000
@@ -2901,9 +2901,14 @@ function views_fetch_fields($base, $type
         }
         foreach (array('field', 'sort', 'filter', 'argument', 'relationship') as $key) {
           if (!empty($info[$key])) {
-            if (!empty($info['skip base'])) {
-              foreach ((array) $info['skip base'] as $base) {
-                $skip_bases[$field][$key] = $base;
+            if (!empty($info[$key]['skip base'])) {
+              foreach ((array) $info[$key]['skip base'] as $base_name) {
+                $skip_bases[$field][$key][$base_name] = TRUE;
+              }
+            }
+            elseif (!empty($info['skip base'])) {
+              foreach ((array) $info['skip base'] as $base_name) {
+                $skip_bases[$field][$key][$base_name] = TRUE;
               }
             }
             foreach (array('title', 'group', 'help', 'base') as $string) {
@@ -2931,7 +2936,7 @@ function views_fetch_fields($base, $type
       foreach ($bases as $base_name) {
         foreach ($strings as $field => $field_strings) {
           foreach ($field_strings as $type_name => $type_strings) {
-            if (empty($skip_bases[$field][$type_name])) {
+            if (empty($skip_bases[$field][$type_name][$base_name])) {
               $fields[$base_name][$type_name]["$table.$field"] = $type_strings;
             }
           }
Index: modules/upload.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/upload.views.inc,v
retrieving revision 1.12
diff -u -F^[^a-z]*function -r1.12 upload.views.inc
--- modules/upload.views.inc	30 Jun 2008 16:37:14 -0000	1.12
+++ modules/upload.views.inc	29 Jul 2008 13:53:49 -0000
@@ -48,7 +48,7 @@ function upload_views_data() {
       'base field' => 'vid',
       // This allows us to not show this relationship if the base is already
       // node so users won't create circular relationships.
-      'skip base' => 'node',
+      'skip base' => array('node', 'node_revisions'),
     ),
   );