Index: openacs-4/www/site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/www/site-master.tcl	11 Dec 2003 21:40:16 -0000	1.10
+++ openacs-4/www/site-master.tcl	5 Jan 2004 12:39:34 -0000	1.11
@@ -30,9 +30,10 @@
 set system_url [ad_url]
 
 # Get user information
-set user_id [ad_conn untrusted_user_id]
-if { [ad_conn untrusted_user_id] != 0 } {
-    set user_name [person::name -person_id $user_id]
+set user_id [ad_conn user_id]
+set untrusted_user_id [ad_conn untrusted_user_id]
+if { $untrusted_user_id != 0 } {
+    set user_name [person::name -person_id $untrusted_user_id]
     set pvt_home_url [ad_pvt_home]
     set pvt_home_name [ad_pvt_home_name]
     if [empty_string_p $pvt_home_name] {
@@ -43,7 +44,7 @@
     # Site-wide admin link
     set admin_url {}
 
-    set sw_admin_p [acs_user::site_wide_admin_p -user_id [ad_conn untrusted_user_id]]
+    set sw_admin_p [acs_user::site_wide_admin_p -user_id $untrusted_user_id]
 
     if { $sw_admin_p } {
         set admin_url "/acs-admin/"
@@ -53,13 +54,15 @@
         set subsite_admin_p [permission::permission_p \
                                  -object_id [subsite::get_element -element object_id] \
                                  -privilege admin \
-                                 -party_id [ad_conn untrusted_user_id]]
+                                 -party_id $untrusted_user_id]
 
         if { $subsite_admin_p  } {
             set admin_url "[subsite::get_element -element url]admin/"
         }
     }
-} else {
+} 
+
+if { $user_id == 0 } {
     set login_url [ad_get_login_url -return]
 }