Index: openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl	15 Feb 2011 09:28:48 -0000	1.12
+++ openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl	27 Oct 2014 16:39:59 -0000	1.13
@@ -6,13 +6,13 @@
 
 set user_id [ad_conn user_id]
 
-set admin_p [ad_permission_p $object_id admin]
+set admin_p [permission::permission_p -object_id $object_id -privilege admin]
 
-if { ![exists_and_not_null return_url] } {
+if { (![info exists return_url] || $return_url eq "") } {
     set return_url [ad_return_url]
 }
 
-if { ![exists_and_not_null privs] } {
+if { (![info exists privs] || $privs eq "") } {
     set privs { read create write delete admin }
 }
 
@@ -65,7 +65,7 @@
 
 set perm_url "[ad_conn subsite_url]permissions/"
 
-if { ![exists_and_not_null user_add_url] } {
+if { (![info exists user_add_url] || $user_add_url eq "") } {
     set user_add_url "${perm_url}perm-user-add"
 }
 set user_add_url [export_vars -base $user_add_url { object_id expanded {return_url "[ad_return_url]"}}]