diff --git a/checkin_notes b/checkin_notes
index 9b70febec8..f52f4b021c 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -18907,3 +18907,18 @@ David 26 Oct 2004
api/
boinc_api.C,h
graphics_api.C
+
+David 26 Oct 2004
+ - forum updates (from Jans)
+
+ NOTE: run the DB update to get the right default behavior
+
+ html/
+ inc/
+ forum.inc
+ ops/
+ db_update.php
+ user/
+ edit_forum_preferences_form.php
+ forum_post.php
+ forum_rate.php
diff --git a/html/inc/forum.inc b/html/inc/forum.inc
index ccf100269b..397e364421 100644
--- a/html/inc/forum.inc
+++ b/html/inc/forum.inc
@@ -569,7 +569,7 @@ function show_post($post, $thread, $logged_in_user, $n, $controls=FORUM_CONTROLS
} else if ($controls == HELPDESK_CONTROLS && !$separate) {
echo " / Score: ", ($post->score * $post->votes), "";
} else {
- echo " / Rating: ", $post->score, " - rate: id."&choice=p\">+ / id."&choice=n\">-";
+ echo " / Rating: ", ($post->score * $post->votes), " - rate: id."&choice=p\">+ / id."&choice=n\">-";
}
if ($controls == FORUM_CONTROLS) {
diff --git a/html/ops/db_update.php b/html/ops/db_update.php
index 72176c42bd..340c5e71df 100644
--- a/html/ops/db_update.php
+++ b/html/ops/db_update.php
@@ -129,6 +129,11 @@ function update_10_25_2004() {
"alter table forum_preferences add high_rating_threshold integer not null"
);
}
+
+function update_10_26_2004() {
+ mysql_query("alter table forum_preferences modify jump_to_unread tinyint(1) unsigned not null default 0");
+}
+
//update_10_25_2004();
?>
diff --git a/html/user/edit_forum_preferences_form.php b/html/user/edit_forum_preferences_form.php
index 030bf46894..0e8d233524 100644
--- a/html/user/edit_forum_preferences_form.php
+++ b/html/user/edit_forum_preferences_form.php
@@ -94,7 +94,7 @@ row2("Signature for message boards".
if ($user->signature!=""){
row2("Signature preview".
"
This is how your signature will look in the forums",
- sanitize_html(stripslashes($user->signature))
+ nl2br(sanitize_html(stripslashes($user->signature)))
);
}
row2("", "");
diff --git a/html/user/forum_post.php b/html/user/forum_post.php
index bd79024fc5..a84214a449 100644
--- a/html/user/forum_post.php
+++ b/html/user/forum_post.php
@@ -26,6 +26,8 @@ if (!empty($_GET['id']) && !empty($_POST['title']) && !empty($_POST['content']))
exit();
}
+ $thread->id=$threadID;
+ setThreadLastVisited($logged_in_user,$thread);
header('Location: forum_thread.php?id=' . $threadID);
}
diff --git a/html/user/forum_rate.php b/html/user/forum_rate.php
index ac7a4d1d52..e3e1fbb5aa 100644
--- a/html/user/forum_rate.php
+++ b/html/user/forum_rate.php
@@ -22,7 +22,7 @@ if (!empty($_GET['post'])) {
exit();
}
- $user = get_logged_in_user($true);
+ $user = get_logged_in_user(true);
$user = getForumPreferences($user);
if (getHasRated($user,$postId)){