5 files changed, 5 insertions, 4 deletions
diff --git a/includes/comment.inc b/includes/comment.inc
index ed1e93c2f..6e01ada3d 100644
--- a/includes/comment.inc
+++ b/includes/comment.inc
@@ -325,6 +325,7 @@ function comment_render($lid, $cid) {
   global $link, $theme, $REQUEST_URI, $user;
 
   // Pre-process variables:
+  $lid = empty($lid) ? 0 : $lid;
   $cid = empty($cid) ? 0 : $cid;
   $mode  = ($user->id) ? $user->mode : 4;
   $order = ($user->id) ? $user->sort : 1;
diff --git a/modules/drupal.module b/modules/drupal.module
index fca8c6119..113cbe95e 100644
--- a/modules/drupal.module
+++ b/modules/drupal.module
@@ -73,7 +73,7 @@ function drupal_page() {
       break;
     default:
       $theme->header();
-      drupal_render(0, $cid);
+      drupal_render($id, $cid);
       $theme->footer();
   }
 }
diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module
index fca8c6119..113cbe95e 100644
--- a/modules/drupal/drupal.module
+++ b/modules/drupal/drupal.module
@@ -73,7 +73,7 @@ function drupal_page() {
       break;
     default:
       $theme->header();
-      drupal_render(0, $cid);
+      drupal_render($id, $cid);
       $theme->footer();
   }
 }
diff --git a/modules/story.module b/modules/story.module
index 2e0ea5b23..dbf7cc7f9 100644
--- a/modules/story.module
+++ b/modules/story.module
@@ -22,7 +22,7 @@ function story_help() {
 }
 
 function story_block() {
-  $result = db_query("SELECT s.id, COUNT(s.id) AS comments, s.subject FROM stories s LEFT JOIN comments c ON s.id = c.lid WHERE s.status = 2 AND c.link = 'link' GROUP BY s.id ORDER BY comments DESC LIMIT 10");
+  $result = db_query("SELECT s.id, COUNT(s.id) AS comments, s.subject FROM stories s LEFT JOIN comments c ON s.id = c.lid WHERE s.status = 2 AND c.link = 'story' GROUP BY s.id ORDER BY comments DESC LIMIT 10");
   while ($story = db_fetch_object($result)) {
     $content .= "<LI><A HREF=\"story.php?id=$story->id\">$story->subject</A><BR><SMALL>(". format_plural($story->comments, "comment", "comments") .")</SMALL></LI>\n";
   }
diff --git a/modules/story/story.module b/modules/story/story.module
index 2e0ea5b23..dbf7cc7f9 100644
--- a/modules/story/story.module
+++ b/modules/story/story.module
@@ -22,7 +22,7 @@ function story_help() {
 }
 
 function story_block() {
-  $result = db_query("SELECT s.id, COUNT(s.id) AS comments, s.subject FROM stories s LEFT JOIN comments c ON s.id = c.lid WHERE s.status = 2 AND c.link = 'link' GROUP BY s.id ORDER BY comments DESC LIMIT 10");
+  $result = db_query("SELECT s.id, COUNT(s.id) AS comments, s.subject FROM stories s LEFT JOIN comments c ON s.id = c.lid WHERE s.status = 2 AND c.link = 'story' GROUP BY s.id ORDER BY comments DESC LIMIT 10");
   while ($story = db_fetch_object($result)) {
     $content .= "<LI><A HREF=\"story.php?id=$story->id\">$story->subject</A><BR><SMALL>(". format_plural($story->comments, "comment", "comments") .")</SMALL></LI>\n";
   }