Index: openacs-4/packages/general-comments/www/admin/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/delete.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/general-comments/www/admin/delete.tcl	20 Jan 2018 22:56:50 -0000	1.7
+++ openacs-4/packages/general-comments/www/admin/delete.tcl	19 Jun 2018 09:35:47 -0000	1.8
@@ -25,31 +25,31 @@
     return_url:onevalue
 }
 
+set revision_id [content::item::get_best_revision -item_id $comment_id]
 # get data from database
-set sql "
+set sql {
     select r.title,
            r.content,
            r.mime_type,
            o.creation_user,
-           to_char(o.creation_date, 'MM-DD-YYYY') as pretty_date,
-           acs_object.name(o.creation_user) as author
+           to_char(o.creation_date, 'MM-DD-YYYY') as pretty_date
       from acs_objects o, 
            cr_revisions r, 
 	   general_comments g
      where g.comment_id = :comment_id and 	 
            g.comment_id = o.object_id and
-	   r.revision_id = content_item.get_latest_revision(g.comment_id)"
+           r.revision_id = :revision_id
+}
 
 if { ![db_0or1row get_comment $sql] } {
-    ad_return_complaint 1 "[_ general-comments.lt_The_comment_id_does_n]"
+    ad_return_complaint 1 [_ general-comments.lt_The_comment_id_does_n]
     ad_script_abort
 }
 
-set page_title "[_ general-comments.Delete_a_comment]"
-set context [list "[_ general-comments.Delete_a_comment]"]
+set author [acs_user::get_element -user_id $creation_user -element name]
+set page_title [_ general-comments.Delete_a_comment]
+set context [list $page_title]
 
-ad_return_template
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4