Index: openacs-4/packages/acs-subsite/www/permissions/perm-modify.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-modify.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/permissions/perm-modify.tcl	27 Oct 2014 16:39:59 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/permissions/perm-modify.tcl	7 Aug 2017 23:47:59 -0000	1.5
@@ -2,7 +2,7 @@
     object_id:naturalnum,notnull
     {perm:multiple {[list]}}
     {privs:optional}
-    return_url
+    return_url:localurl
 }
 
 
@@ -33,12 +33,11 @@
 }
 
 # Don't want them to remove themselves as admins
-if { ![info exists perm_array([ad_conn user_id],admin)] } {
+if { ![info exists perm_array([ad_conn user_id],admin)] && ![acs_user::site_wide_admin_p] } {
     set perm_array([ad_conn user_id],admin) add
 }
 
-set page "<ul>"
-
+set changes_p false
 db_transaction {
     db_foreach permissions_in_db {} {
 
@@ -62,20 +61,26 @@
         
         switch -- $perm_array($elm) {
             remove {
-                db_exec_plsql remove {}
-                append page "<li>select acs_permission__revoke_permission($object_id, $party_id, $privilege)"
+                permission::revoke -party_id $party_id -object_id $object_id -privilege $privilege
+                set changes_p true
             }
             add {
-                db_exec_plsql add {}
-                append page "<li>select acs_permission__grant_permission($object_id, $party_id, $privilege)"
+                permission::grant -party_id $party_id -object_id $object_id -privilege $privilege
+                set changes_p true
             }
         }
     }
 } on_error {
-    global errorInfo
-    ad_return_complaint 1 "Ooops, looks like we screwed up. Sorry. $errmsg<p> $errorInfo"
+    ad_return_complaint 1 "[_ acs-tcl.The] $errmsg<p> $::errorInfo"
+    ad_script_abort
 }
 
-append page "</ul>"
+set message [expr {$changes_p ? [_ acs-subsite.Information_Updated] : ""}]
 
-ad_returnredirect $return_url
+ad_returnredirect -message $message $return_url
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: