Index: openacs-4/packages/acs-admin/www/apm/cvs-status.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/cvs-status.xql,v
diff -u -N -r1.2 -r1.2.22.1
--- openacs-4/packages/acs-admin/www/apm/cvs-status.xql	24 Sep 2003 18:23:36 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/cvs-status.xql	9 Sep 2013 07:56:43 -0000	1.2.22.1
@@ -3,7 +3,7 @@
 
 <fullquery name="email_by_user_id">      
       <querytext>
-      select email from parties where party_id = [ad_get_user_id]
+      select email from parties where party_id = [ad_conn user_id]
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl,v
diff -u -N -r1.52.2.3 -r1.52.2.4
--- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	7 Sep 2013 14:36:49 -0000	1.52.2.3
+++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	9 Sep 2013 07:56:43 -0000	1.52.2.4
@@ -567,7 +567,7 @@
     Replace the ad_get_user procs with our own versions
 } {
     if { $enabled_p } {
-	if { [info commands orig_ad_get_user_id] eq ""} {
+	if { [info commands orig_ad_conn] eq ""} {
             #ds_comment "Enabling user-switching"
             # let the user stay who he is now (but ignore any error trying to do so)
 	    catch {
@@ -580,16 +580,16 @@
             proc ad_conn { args } {
 	        ds_conn {*}$args
             }
-	    proc ad_get_user_id {} {
-                ds_get_user_id
-	    }
+	    #proc ad_get_user_id {} {
+            #    ds_get_user_id
+	    #}
 	    #proc ad_verify_and_get_user_id {} {
             #    ds_get_user_id
 	    #}
 	}
     } else {
         #ds_comment "Disabling user-switching"
-	if { [info commands orig_ad_get_user_id] ne ""} {
+	if { [info commands orig_ad_conn] ne ""} {
             rename ad_conn {}
             rename orig_ad_conn ad_conn