X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FForum.pm;h=ca2195e352f3d7bd313af97f8b95dabd70ac5809;hb=78b07c0a2aab8d21b6609c2c93fd2db5876c0d18;hp=6b122c67e30122e36a8a11320db66388bb339179;hpb=7dcdd7e02acf397d9cae7f9c435ace1f7b837d67;p=ndwebbie.git

diff --git a/ND/Web/Forum.pm b/ND/Web/Forum.pm
index 6b122c6..ca2195e 100644
--- a/ND/Web/Forum.pm
+++ b/ND/Web/Forum.pm
@@ -25,8 +25,7 @@ use HTML::Template;
 use ND::Web::Include;
 require Exporter;
 
-our @ISA = qw/Exporter/;
-
+our @ISA = qw/Exporter/; 
 our @EXPORT = qw/viewForumThread addForumPost addForumThread markThreadAsRead/;
 
 sub viewForumThread {
@@ -38,7 +37,7 @@ sub viewForumThread {
 	$template->param(Post => $thread->{post});
 
 	my $posts = $ND::DBH->prepare(q{SELECT u.username,date_trunc('seconds',fp.time::timestamp) AS time,fp.message,COALESCE(fp.time > ftv.time,TRUE) AS unread
-FROM forum_threads ft JOIN forum_posts fp USING (ftid) JOIN users u USING (uid) LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
+FROM forum_threads ft JOIN forum_posts fp USING (ftid) JOIN users u ON u.uid = fp.uid LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
 WHERE ft.ftid = $1
 ORDER BY fp.time ASC
 });
@@ -84,9 +83,9 @@ sub addForumPost {
 sub addForumThread {
 	my ($dbh,$board,$uid,$subject) = @_;
 
-	my $insert = $dbh->prepare(q{INSERT INTO forum_threads (fbid,subject) VALUES($1,$2)});
+	my $insert = $dbh->prepare(q{INSERT INTO forum_threads (fbid,subject,uid) VALUES($1,$2,$3)});
 
-	if ($insert->execute($board->{id},escapeHTML($subject))){
+	if ($insert->execute($board->{id},escapeHTML($subject),$uid)){
 		my $id = $dbh->last_insert_id(undef,undef,undef,undef,"forum_threads_ftid_seq");
 		return $dbh->selectrow_hashref(q{SELECT ftid AS id, subject, $2::boolean AS post FROM forum_threads WHERE ftid = $1}
 			,undef,$id,$board->{post})