Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.116 -r1.117
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	14 May 2002 19:27:54 -0000	1.116
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	14 May 2002 21:42:15 -0000	1.117
@@ -228,8 +228,9 @@
                 -community_key $community_key \
                 -parent_community_id $parent_community_id]} {
             ad_return_complaint \
-                    1 "The name <strong>$pretty_name</strong> is already in use. \n
-                       Please select a different name."
+                    1 "The name <strong>$pretty_name</strong> is already in use either by 
+                       an active or archived group. \n Please select a different name."
+            ad_script_abort
         }
 
         # Add core vars
@@ -1012,7 +1013,7 @@
         community by checking that it's not the same as an existing (possible)
         sibling's name.
     } {
-        if {[db_0or1row collision_check {}]} {
+        if {[db_string collision_check {}] > 0} {
             # got a collision
             return 0
         } else {
@@ -1418,19 +1419,14 @@
 
     } {
         db_transaction {
-            # do RemovePortlet callback, we send comm_id, and user_id
+            # do RemoveUserFromCommunity callback, which 
+            # calls the RemovePortlet proc with the right params
             foreach user [list_users $community_id] { 
                 set user_id [ns_set get $user user_id]
-                set portal_id [dotlrn::get_workspace_portal_id $user_id]
-                set list_args [list $portal_id [list \
-                                                    "user_id" $user_id \
-                                                    "community_id" $community_id]
-               ]
-
                 applets_dispatch \
                     -community_id $community_id \
-                    -op RemovePortlet \
-                    -list_args $list_args
+                    -op RemoveUserFromCommunity \
+                    -list_args [list $community_id $user_id]
             }
 
             # revoke privs