Index: openacs-4/packages/file-manager/www/file-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/file-edit-2.tcl,v
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- openacs-4/packages/file-manager/www/file-edit-2.tcl	20 Apr 2001 20:51:14 -0000	1.1.1.1
+++ openacs-4/packages/file-manager/www/file-edit-2.tcl	9 Mar 2002 23:54:35 -0000	1.1.1.1.2.1
@@ -49,10 +49,10 @@
 	set user_id [ad_verify_and_get_user_id]
 
 	db_1row user_info {
-	    select first_names || ' ' || last_name as name,
-	           email
-	    from   users
-	    where  user_id = :user_id
+            select first_names || ' ' || last_name as name, 
+                   email 
+            from persons pe, parties pa 
+            where pe.person_id=:user_id and pa.party_id=pe.person_id
 	}
 	db_release_unused_handles
 
Index: openacs-4/packages/version-control/tcl/version-control-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/version-control/tcl/version-control-procs.tcl,v
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- openacs-4/packages/version-control/tcl/version-control-procs.tcl	20 Apr 2001 20:51:23 -0000	1.1.1.1
+++ openacs-4/packages/version-control/tcl/version-control-procs.tcl	9 Mar 2002 23:54:35 -0000	1.1.1.1.2.1
@@ -110,7 +110,7 @@
 } {
 
     # Try the system default
-    set root [ad_parameter CVSROOT vc]
+    set root [ad_parameter  -package_id [apm_package_id_from_key version-control] CVSROOT]
 
     # If not defined we go to the fallback methods
     if [empty_string_p $root] {
@@ -323,7 +323,7 @@
     starts execution from [acs_root_dir].
 
 } {
-    set cvs [ad_parameter CvsPath vc "/usr/local/bin/cvs"]
+    set cvs [ad_parameter  -package_id [apm_package_id_from_key version-control] CvsPath version-control "/usr/local/bin/cvs"]
     return  [exec /bin/env CVS_RSH=/usr/local/bin/ssh /bin/sh -c "cd [acs_root_dir] ; $cvs -d [vc_fetch_root] $cmd"]
 }