Index: openacs-4/packages/general-comments/www/delete-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/Attic/delete-oracle.xql,v
diff -u -N
--- openacs-4/packages/general-comments/www/delete-oracle.xql	5 May 2007 15:54:47 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-
-<fullquery name="get_comment"> 
-           <querytext>
-
-    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
-      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)
-
-      </querytext>
-
-</fullquery>
-
- 
- 
-</queryset>
Index: openacs-4/packages/general-comments/www/delete-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/Attic/delete-postgresql.xql,v
diff -u -N
--- openacs-4/packages/general-comments/www/delete-postgresql.xql	5 May 2007 15:54:47 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
- 
-<fullquery name="get_comment">      
-	<querytext>
- 
-     
-      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
-      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) 
-      </querytext>
-
-</fullquery>
- 
-</queryset>
Index: openacs-4/packages/general-comments/www/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/general-comments/www/delete.tcl	20 Jan 2018 22:56:50 -0000	1.5
+++ openacs-4/packages/general-comments/www/delete.tcl	19 Jun 2018 07:58:41 -0000	1.6
@@ -28,7 +28,7 @@
 permission::require_permission -party_id [ad_conn user_id] -object_id $comment_id -privilege "write"
 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,
@@ -39,19 +39,18 @@
 	   general_comments g
      where g.comment_id = :comment_id and 	 
            g.comment_id = o.object_id and
-	   r.revision_id = $revision_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 author [person::name -person_id $creation_user]
-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