Index: openacs-4/packages/xotcl-core/tcl/context-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/context-procs.tcl,v
diff -u -N -r1.47 -r1.48
--- openacs-4/packages/xotcl-core/tcl/context-procs.tcl	26 Jan 2009 20:53:27 -0000	1.47
+++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl	30 Apr 2009 07:35:10 -0000	1.48
@@ -288,6 +288,18 @@
       }
     }
   }
+  ConnectionContext instproc get_user_id {} {
+    #
+    # If the untrusted user_id exists, return it. This will return
+    # consistently the user_id also in situations, where the login
+    # cookie was expired. If no untrusted_user_id exists Otherwise
+    # (maybe in a remoting setup), return the user_id.
+    #
+    if {[my exists untrusted_user_id]} {
+      return [my set untrusted_user_id]
+    }
+    return [my user_id]
+  }
 
   ConnectionContext instproc returnredirect {url} {
     #my log "--rp"