Index: indexpage.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/indexpage/indexpage.module,v
retrieving revision 1.5
diff -u -r1.5 indexpage.module
--- indexpage.module	5 May 2005 13:37:53 -0000	1.5
+++ indexpage.module	12 Jun 2005 00:16:52 -0000
@@ -31,7 +31,7 @@
   $output = form_group(t("General settings"), $group);
   $result = @db_query("SELECT DISTINCT type FROM {node} ORDER BY type");
   while ($node = db_fetch_object($result)) {
-    $group = form_textfield(t("Name to show for this node type"), "indexpage_".$node->type."_name", variable_get("indexpage_".$node->type."_name", $node->type), 20, 50, "");
+    $group = form_textfield(t("Name to show for this node type"), "indexpage_".$node->type."_name", variable_get("indexpage_".$node->type."_name", node_invoke($node->type,'node_name')), 20, 50, "");
     $group .= form_checkbox(t("Enable index page for this node type"), "indexpage_".$node->type."_enable", 1, variable_get("indexpage_".$node->type."_enable", 1));
     $group .= form_checkbox(t("Show alphabetical index for this node type"), "indexpage_".$node->type."_alphaindex", 1, variable_get("indexpage_".$node->type."_alphaindex", 1));
     $group .= form_checkbox(t("Show vocabulary filters for this node type"), "indexpage_".$node->type."_vocfilter", 1, variable_get("indexpage_".$node->type."_vocfilter", 1));
@@ -52,7 +52,7 @@
   }
   $result = @db_query("SELECT DISTINCT type FROM {node} ORDER BY type");
   while ($node = db_fetch_object($result)) {
-    array_push($items, array('path' => 'indexpage/'.$node->type, 'title' => t("index page for %s", array("%s" => $node->type)), 'access' => user_access('access indexpage'), 'type' => MENU_NORMAL_ITEM));
+    array_push($items, array('path' => 'indexpage/'.$node->type, 'title' => t("index page for %s", array("%s" => node_invoke($node->type,'node_name'))), 'access' => user_access('access indexpage'), 'type' => MENU_NORMAL_ITEM));
   }
   return $items;
 }
@@ -65,7 +65,7 @@
     $result = db_query("SELECT DISTINCT type FROM {node} ORDER BY type");
     while ($node = db_fetch_object($result)) {
       if (variable_get("indexpage_".$node->type."_enable", 1)) {
-        $output .= '<li>'.l("Index page for ".variable_get("indexpage_".$node->type."_name", $node->type), "indexpage/".$node->type).'</li>';
+        $output .= '<li>'.l("Index page for ".variable_get("indexpage_".$node->type."_name", node_invoke($node,'node_name')), "indexpage/".$node->type).'</li>';
       }
     }
     $output .= '</ul></div>';