Index: views_tabs_plugin_style.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_tabs/includes/views_tabs_plugin_style.inc,v
retrieving revision 1.1.2.6
diff -u -r1.1.2.6 views_tabs_plugin_style.inc
--- views_tabs_plugin_style.inc	16 Mar 2010 22:37:11 -0000	1.1.2.6
+++ views_tabs_plugin_style.inc	21 Jun 2010 23:56:28 -0000
@@ -13,12 +13,7 @@
       $options = $this->options;
       $opt = array('' => t('<None>'));
       foreach ($this->display->handler->get_handlers('field') as $field => $handler) {
-        if ($label = $handler->label()) {
-          $opt[$field] = $label;
-        }
-        else {
-          $opt[$field] = $handler->ui_name();
-        }
+        $opt[$field] = $handler->ui_name();
       }
       $form['tab_field'] = array(
         '#title' => t('Tab field'),
@@ -50,7 +45,14 @@
         $rows = array();
         foreach ($records as $label => $row) {
           if ($this->uses_fields()) {
-            $content .= theme($this->theme_functions(), $this->view, $this->options, $this->row_plugin->render($row));
+            $title_field = $this->options['tab_field'];
+            $title = $this->rendered_fields[$label][$title_field];
+            $tabset[] = array(
+              '#title' => $title,
+              '#type' => 'tabpage',
+              '#content' => theme($this->theme_functions(), $this->view, $this->options, $this->row_plugin->render($row)),
+              '#attributes' => array('class' => 'tab-title'),
+            );
           } else {
             $node = node_load($row->nid);
             $node->view = $this->view;
@@ -72,16 +74,6 @@
       } else {
         $rows = $records;
       }
-      if (!$tabset[$title] && $this->uses_fields()) {
-        $tabset[$title] = array(
-          '#type' => 'tabpage',
-          '#content' => $content,
-          '#title' => $title,
-          '#attributes' => array('class' => 'tab-title'),
-        );
-      } else if ($this->uses_fields()) {
-        $tabset[$title]['#content'] .= $content;
-      }
     }
     unset($this->view->row_index);
     return drupal_render($tabset);