Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete-2.tcl,v
diff -u -r1.2.12.1 -r1.2.12.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete-2.tcl	10 Sep 2015 08:21:46 -0000	1.2.12.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete-2.tcl	28 Oct 2015 09:38:38 -0000	1.2.12.2
@@ -17,11 +17,8 @@
 
 if {$operation eq "Yes, I really want to delete this role"} {
     db_transaction {
-	if { [catch {db_exec_plsql drop_role {begin acs_rel_type.drop_role(:role);end;}} errmsg] } {
-	    if { [db_string role_used_p {
-		select case when exists (select 1 from acs_rel_types where role_one = :role or role_two = :role) then 1 else 0 end
-		from dual
-	    }] } {
+	if { [catch {db_exec_plsql drop_role {}} errmsg] } {
+	    if { [db_string role_used_p {}] } {
 		ad_return_complaint 1 "<li> The role \"$role\" is still in use. You must remove all relationship types that use this role before you can remove this role."
 		return
 	    } else {