Index: includes/handlers.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/handlers.inc,v
retrieving revision 1.88
diff -u -F^[^a-z]*function -r1.88 handlers.inc
--- includes/handlers.inc	25 Jun 2008 22:20:01 -0000	1.88
+++ includes/handlers.inc	18 Jul 2008 08:20:23 -0000
@@ -33,13 +33,15 @@ function _views_create_handler($definiti
  */
 function _views_prepare_handler($definition, $data, $field) {
   foreach (array('group', 'title', 'help', 'real field') as $key) {
-    // First check the field level
-    if (!isset($definition[$key]) && !empty($data[$field][$key])) {
-      $definition[$key] = $data[$field][$key];
-    }
-    // Then if that doesn't work, check the table level
-    else if (!isset($definition['table'][$key]) && !empty($data['table'][$key])) {
-      $definition[$key] = $data['table'][$key];
+    if (!isset($definition[$key])) {
+      // First check the field level
+      if (!empty($data[$field][$key])) {
+        $definition[$key] = $data[$field][$key];
+      }
+      // Then if that doesn't work, check the table level
+      else if (!empty($data['table'][$key])) {
+        $definition[$key] = $data['table'][$key];
+      }
     }
   }