- fixed bug in search.php

- fixed bug in discussion.php
- theme update: comment() now takes 3 arguments:
    $comment - an object with comment data
    $link    - a link to the reply form of that particular
               comment
    $thread  - the subthread of that particular comment
- theme 'marvin' and theme 'zaphod' are updated, theme
  'unconed' is left to be done

2 files changed, 11 insertions, 11 deletions

diff --git a/includes/config.inc b/includes/config.inc
index c5fdffd8f..fa943fedb 100644
--- a/includes/config.inc
+++ b/includes/config.inc
@@ -11,17 +11,17 @@
 #$dbname = "droporg";
 
 ### http://beta.drop.org/:
-$dbhost = "zind.net";
-$dbuname = "dries";
-$dbpass = "Abc123";
-$dbname = "dries";
-
-### http://dione/:
-#$dbhost = "";
+#$dbhost = "zind.net";
 #$dbuname = "dries";
-#$dbpass = "oakley";
+#$dbpass = "Abc123";
 #$dbname = "dries";
 
+### http://dione/:
+$dbhost = "";
+$dbuname = "dries";
+$dbpass = "oakley";
+$dbname = "dries";
+
 #
 # Name of the site
 #
@@ -118,7 +118,7 @@ $submission_votes = array("neutral (+0)" => "+ 0",
 #
 # Submission moderation thresholds:
 #
-$submission_post_threshold = "2";
+$submission_post_threshold = "3";
 $submission_dump_threshold = "-2";
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/story.inc b/includes/story.inc
index 31deede65..d0c40ab14 100644
--- a/includes/story.inc
+++ b/includes/story.inc
@@ -1,7 +1,7 @@
 <?
 
 class Story {
-  function story($userid, $subject, $abstract, $article, $category, $timestamp) {
+  function Story($userid, $subject, $abstract, $article, $category, $timestamp) {
     $this->userid = $userid;
     $this->subject = $subject;
     $this->abstract = $abstract;