Index: openacs-4/packages/forums/www/message-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v
diff -u -N -r1.52 -r1.53
--- openacs-4/packages/forums/www/message-view.tcl	12 Jul 2015 04:27:45 -0000	1.52
+++ openacs-4/packages/forums/www/message-view.tcl	7 Aug 2017 23:48:11 -0000	1.53
@@ -9,6 +9,14 @@
 } {
     message_id:naturalnum,notnull
     {display_mode:word ""}
+} -validate {
+    valid_message_id -requires {message_id:naturalnum} {
+        # Load up the message information
+        forum::message::get -message_id $message_id -array message
+        if {![array exists message]} {
+            ad_complain "Invalid message_id"
+        }
+    }
 }
 
 #######################
@@ -17,12 +25,6 @@
 #
 #######################
 
-# Load up the message information
-forum::message::get -message_id $message_id -array message
-if {![array exists message]} {
-    ns_returnnotfound
-    ad_script_abort
-}
 
 # Load up the forum information
 forum::get -forum_id $message(forum_id) -array forum
@@ -72,14 +74,7 @@
 
 # If this is a top-level thread, we allow subscriptions here
 if { $message(parent_id) eq "" } {
-    set notification_chunk [notification::display::request_widget \
-        -type forums_message_notif \
-        -object_id $message(message_id) \
-        -pretty_name $message(subject) \
-        -url [ad_conn url]?message_id=$message(message_id) \
-    ]
-} else {
-    set notification_chunk ""
+    set message_url [export_vars -base [ad_conn url] {message_id $message(message_id)}]
 }
 
 if { [forum::use_ReadingInfo_p] && $message(state) eq "approved" } {
@@ -120,4 +115,10 @@
 # js scripts
 template::head::add_script -type "text/javascript" -src "/resources/forums/forums.js" -order 2
 
-set page_title [_ forums.Thread_title]
+set doc(title) [_ forums.Thread_title]
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: