Index: content_types/node_content.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/node_content.inc,v
retrieving revision 1.1.2.13
diff -u -p -r1.1.2.13 node_content.inc
--- content_types/node_content.inc	27 May 2008 20:21:11 -0000	1.1.2.13
+++ content_types/node_content.inc	25 Jul 2008 23:57:45 -0000
@@ -59,11 +59,14 @@ function panels_content_node_content($co
     if (!empty($conf['identifier'])) {
       $node->panel_identifier = $conf['identifier'];
     }
-
     $block->subject = $node->title;
-
-    unset($node->title);
+    if (empty($conf['node_title'])) {
+      unset($node->title);
+    }
     $block->content = panels_admin_node_content($node, $conf);
+    if (!empty($conf['link'])) {
+      $block->title_link = "node/$node->nid";
+    }
   }
 
   if (node_access('update', $node)) {
@@ -75,10 +78,6 @@ function panels_content_node_content($co
     );
   }
 
-  if (!empty($conf['link']) && $node) {
-    $block->title_link = "node/$node->nid";
-  }
-
   return $block;
 }
 
@@ -133,6 +132,7 @@ function panels_admin_node_content($node
 function panels_admin_edit_node_content($id, $parents, $conf = array()) {
   if ($conf == array()) {
     $conf = array(
+      'node_title' => FALSE,
       'links' => TRUE,
       'page' => TRUE,
       'no_extras' => TRUE,
@@ -157,6 +157,12 @@ function panels_admin_edit_node_content(
   $form['aligner_stop'] = array(
     '#value' => '</div><div style="clear: both; padding: 0; margin: 0"></div>',
   );
+  $form['node_title'] = array(
+    '#title' => t('Display node title'),
+    '#type' => 'checkbox',
+    '#default_value' => $conf['node_title'],
+    '#description' => t('Check here to display the node title. Depending on the configuration of this pane and other contents of this display, enabling this option might display the node title twice or as the page title.'),
+  );
   $form['link'] = array(
     '#title' => t('Link title to node'),
     '#type' => 'checkbox',