Index: openacs-4/packages/dotlrn/www/admin/user-nuke-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/user-nuke-oracle.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/user-nuke-oracle.xql	6 Oct 2003 13:21:53 -0000	1.1
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+    <fullquery name="nuke_user">
+        <querytext>
+           begin 
+             acs.remove_user(:user_id); 
+           end; 
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/dotlrn/www/admin/user-nuke-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/user-nuke-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/user-nuke-postgresql.xql	6 Oct 2003 13:21:53 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="nuke_user">
+        <querytext>
+           select acs__remove_user(:user_id);
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/dotlrn/www/admin/user-nuke.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-nuke.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/user-nuke.tcl	4 Dec 2002 09:51:04 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/user-nuke.tcl	6 Oct 2003 13:21:53 -0000	1.3
@@ -38,7 +38,7 @@
 if [form is_valid confirm_delete] {
     form get_values confirm_delete user_id confirmed_p
     if [string equal $confirmed_p t] {
-	if [catch { db_exec_plsql nuke_user { begin acs.remove_user(:user_id); end; } } errMsg ] {
+	if [catch { db_exec_plsql nuke_user {} } errMsg ] {
 	    ad_return_template user-nuke-error
 	} else {
 	    # Nuke was successful.
Index: openacs-4/packages/dotlrn/www/admin/users-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/dotlrn/www/admin/users-chunk.adp	25 Sep 2003 18:06:59 -0000	1.20
+++ openacs-4/packages/dotlrn/www/admin/users-chunk.adp	6 Oct 2003 13:21:53 -0000	1.21
@@ -73,7 +73,7 @@
 <if @type@ eq "pending">
     <td align="left">
     <% # We had to escape to Tcl to get the desired behavior. AG %>
-    <small><a href="/acs-admin/users/member-state-change?user_id=@users.user_id@&member_state=approved&return_url=<%= [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$users(user_id)&referer=$referer] %>">#dotlrn.lt_approve_and_add_to_do#</a> | <a href="user-nuke?user_id=@users.user_id@&referer=@referer@">#dotlrn.nuke#</small>
+    <small><a href="/acs-admin/users/member-state-change?user_id=@users.user_id@&member_state=approved&return_url=<%= [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$users(user_id)&referer=$referer] %>">#dotlrn.lt_approve_and_add_to_do#</a> | <a href="user-nuke?user_id=@users.user_id@&referer=@referer@">#acs-kernel.common_delete#</small>
     </td>
 </if>
 <else>