Index: openacs-4/packages/forums/lib/message/row.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/row.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/forums/lib/message/row.tcl	27 Oct 2014 16:41:36 -0000	1.12
+++ openacs-4/packages/forums/lib/message/row.tcl	7 Aug 2017 23:48:11 -0000	1.13
@@ -1,27 +1,35 @@
-ad_page_contract {
+ad_include_contract {
 
-    a message chunk to be included in a table listing of messages
+    A message chunk to be included in a table listing of messages
 
     @author yon (yon@openforce.net)
     @author arjun (arjun@openforce.net)
     @creation-date 2002-06-02
     @cvs-id $Id$
 
+} {
+    {rownum:integer 1}
+    {presentation_type:word ""}
+    {forum_moderated_p:boolean 0}
+    {moderate_p:boolean 0}
+    {post_p:boolean 0}
+    {preview:boolean 0}
+    {alt_template:token ""}
+    {message}
 }
 
 set viewer_id [ad_conn user_id]
 set useScreenNameP [parameter::get -parameter "UseScreenNameP" -default 0]
 
-if {(![info exists rownum] || $rownum eq "")} { 
-    set rownum 1
+if {0 && [info exists message(message_id)]} {
+    set message(content) [::util::disk_cache_eval \
+                          -call [list ad_html_text_convert -from $message(format) -to text/html -- $message(content)] \
+                          -key fragments \
+                          -id $message(message_id)]
+} else {
+    set message(content) [ad_html_text_convert -from $message(format) -to text/html -- $message(content)]
 }
 
-if {(![info exists presentation_type] || $presentation_type eq "")} {
-    set presentation_type ""
-}
-
-set message(content) [ad_html_text_convert -from $message(format) -to text/html -- $message(content)]
-
 if {$useScreenNameP} {
     acs_user::get -user_id $viewer_id -array user_info
     set message(screen_name) $user_info(screen_name)
@@ -30,21 +38,14 @@
 }
 
 
-
 # convert emoticons to images if the parameter is set
 if { [string is true [parameter::get -parameter DisplayEmoticonsAsImagesP -default 0]] } {
     set message(content) [forum::format::emoticons -content $message(content)]
 }
 
-# JCD: display subject only if changed from the root subject
-if {![info exists root_subject]} {
-    set display_subject_p 1
-} else {
-    regsub {^(Response to |\s*Re:\s*)*} $message(subject) {} subject
-    set display_subject_p [expr {$subject ne $root_subject }] 
-}
+set display_subject_p 1
 
-if {([info exists alt_template] && $alt_template ne "")} {
+if {$alt_template ne ""} {
   ad_return_template $alt_template
 }
 if {![info exists message(message_id)]} {
@@ -57,10 +58,25 @@
 set allow_edit_own_p [parameter::get -parameter AllowUsersToEditOwnPostsP -default 0]
 set own_p [expr {$message(user_id) eq $viewer_id && $allow_edit_own_p}]
 
-if { [info exists preview] } {
+if { $preview } {
     set any_action_p 0
 } else {
-    set notflat_p [expr {$presentation_type ne "flat"}]
-    set post_and_notflat_p [expr {$permissions(post_p) && $notflat_p}]
-    set any_action_p [expr { $post_and_notflat_p || $viewer_id || $moderate_p }]
+    set notflat_p          [expr {$presentation_type ne "flat"}]
+    set post_and_notflat_p [expr {$post_p && $notflat_p}]
+    set any_action_p       [expr {$post_and_notflat_p || $viewer_id || $moderate_p}]
 }
+
+template::add_body_script -script [subst {
+    document.getElementById('toggle$message(message_id)').addEventListener('click', function (event) {
+        event.preventDefault();
+        forums_toggle('$message(message_id)');
+        return false;
+    }, false);
+}]
+
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: