Index: tabbed_block.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tabbed_block/tabbed_block.module,v
retrieving revision 1.5
diff -u -r1.5 tabbed_block.module
--- tabbed_block.module	26 Jul 2007 16:35:20 -0000	1.5
+++ tabbed_block.module	9 Aug 2007 15:47:54 -0000
@@ -95,7 +95,11 @@
       $tab_subject = "<ul>";
       $tab_content = "";
       foreach ( $settings as $conf ){
-        list( $name , $delta ) = explode( "-" , $conf );
+        list( $name , $delta, $delta2 ) = explode( "-" , $conf );
+        
+        if ( $delta2 ){
+          $delta = $delta."-".$delta2;
+        }
         
         //use this function to get the block content,
         //instead of hard code
@@ -106,16 +110,17 @@
         //catch potential empty block, redirect user to overide title
         if ( $temp->subject ){
           $tab_subject .= "<li><a href='#fragment".$module_delta."-".$i."' onclick='return(false);'>".$temp->subject."</a></li>";
+          //tabe content
+          if ( $temp->content ){
+            $tab_content .= "<div id='fragment".$module_delta."-".$i."'>".$temp->content."</div>";
+          }else{
+            $tab_content = "<div id='fragment".$module_delta."-".$i."'>Nothing here.</div>";
+          }
         }else{
           $tab_subject .= "<li><a href='#fragment".$module_delta."-".$i."' onclick='return(false);'>Error! click here!</a></li>";
-          $tab_content .= l("Config title here." , base_path()."admin/build/block/configure/".$name."/".$delta);
-        }
-        //tabe content
-        if ( $temp->content ){
-          $tab_content .= "<div id='fragment".$module_delta."-".$i."'>".$temp->content."</div>";
-        }else{
-          $tab_content .= "<div id='fragment".$module_delta."-".$i."'>Nothing here.</div>";
+          $tab_content .= "<div id='fragment".$module_delta."-".$i."'>".l("Please config the tab title here." , "admin/build/block/configure/".$name."/".$delta)."</div>";
         }
+
         $i++;
       }
       $tab_subject .= "</ul>";
@@ -280,17 +285,14 @@
  */
 function tabbed_block_output_content_block($conf) {
   $block = (object) module_invoke($conf['module'], 'block', 'view', $conf['delta']);
+  
   $block->module = $conf['module'];
   $block->delta = $conf['delta'];
-  if ($conf['override_title']) {
-    $block->subject = check_plain($conf['override_title_text']);
-  }
   
   if ( !$block->subject ){
     $temp = block_box_get( $conf['delta'] );
     $block->subject = $temp['title'];
   }
-  
   if ( !$block->subject ){
     $temp = db_fetch_array(db_query("SELECT title FROM {blocks} WHERE module = '".$conf['module']."' AND delta ='".$conf['delta']."'" ) );
     $block->subject = $temp['title'];