Index: openacs-4/packages/acs-subsite/lib/user-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.tcl,v
diff -u -N -r1.21.6.1 -r1.21.6.2
--- openacs-4/packages/acs-subsite/lib/user-info.tcl	27 Aug 2013 12:20:36 -0000	1.21.6.1
+++ openacs-4/packages/acs-subsite/lib/user-info.tcl	5 Oct 2013 13:02:11 -0000	1.21.6.2
@@ -8,17 +8,17 @@
 
 auth::require_login -account_status closed
 
-if { ![exists_and_not_null user_id] } {
+if { (![info exists user_id] || $user_id eq "") } {
     set user_id [ad_conn untrusted_user_id]
 } elseif { $user_id != [auth::get_user_id -account_status closed] } {
     permission::require_permission -object_id $user_id -privilege admin
 }
 
-if { ![exists_and_not_null return_url] } {
+if { (![info exists return_url] || $return_url eq "") } {
     set return_url [ad_conn url]
 }
 
-if { ![exists_and_not_null show_groups_p] } {
+if { (![info exists show_groups_p] || $show_groups_p eq "") } {
     set show_groups_p 0
 }