Index: includes/display_edit.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/includes/Attic/display_edit.inc,v
retrieving revision 1.1.2.54
diff -u -p -r1.1.2.54 display_edit.inc
--- includes/display_edit.inc	5 Jun 2008 04:22:44 -0000	1.1.2.54
+++ includes/display_edit.inc	13 Jun 2008 22:15:17 -0000
@@ -639,7 +639,11 @@ function panels_show_pane($display, $pan
     $block = _panels_render_preview_pane_disabled($pane, $display->context);
   }
 
-  $output = theme('panels_pane_dnd', $block, $pane->pid, empty($content_type) ? panels_get_pane_title($pane, $display->context) : $block->title, $left_buttons, $buttons);
+  // This is just used for the title bar of the pane, not the content itself.
+  // If we know the content type, use the appropriate title for that type,
+  // otherwise, set the title using the content itself.
+  $title = !empty($content_type) ? panels_get_pane_title($pane, $display->context) : $block->title;
+  $output = theme('panels_pane_dnd', $block, $pane->pid, $title, $left_buttons, $buttons);
   if ($skin) {
     $class = 'panel-pane' . ($pane->shown ? '' : ' hidden-pane');
     $output = '<div class="' . $class . '" id="panel-pane-' . $pane->pid . '">' . $output . '</div>';