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.17 -r1.18
--- openacs-4/packages/acs-subsite/lib/user-info.tcl	10 Jan 2007 21:22:05 -0000	1.17
+++ openacs-4/packages/acs-subsite/lib/user-info.tcl	14 May 2007 20:30:24 -0000	1.18
@@ -111,30 +111,6 @@
                  ]]
 }
 
-
-if {[apm_package_installed_p categories]} {
-    # get groups the user is in
-    set group_ids  [db_list get_groups {
-	select distinct groups.group_id
-	from groups, group_member_map gm
-	where groups.group_id = gm.group_id
-	and gm.member_id = :user_id
-    }]
-
-    foreach group_id $group_ids {
-	set element_name "category_ids$group_id"
-	if {$group_id < 0} {
-	    set element_name "category_ids[expr - $group_id]"
-	}
-
-	category::ad_form::add_widgets \
-	    -container_object_id $group_id \
-	    -categorized_object_id $user_id \
-	    -form_name user_info \
-	    -element_name $element_name
-    }
-}
-
 ad_form -extend -name user_info -form {
     {url:text,optional
         {label "[_ acs-subsite.Home_page]"}
@@ -154,7 +130,7 @@
 } -on_submit {
 
     # Makes the email an image or text according to the level of privacy
-    email_image::edit_email_image -user_id $user_id -new_email $email
+    catch {email_image::edit_email_image -user_id $user_id -new_email $email} errmsg
 
     set user_info(authority_id) $user(authority_id)
     set user_info(username) $user(username)
@@ -170,23 +146,6 @@
                           -array user_info]
 
 
-    if {[apm_package_installed_p categories]} {
-	set cat_ids [list]
-	foreach group_id $group_ids {
-	    set element_name "category_ids$group_id"
-	    if {$group_id < 0} {
-		set element_name "category_ids[expr - $group_id]"
-	    }
-
-	    set cat_ids [concat $cat_ids \
-			     [category::ad_form::get_categories \
-				  -container_object_id $group_id \
-				  -element_name $element_name]]
-	}
-
-	category::map_object -remove_old -object_id $user_id $cat_ids
-    }
-
     # Handle authentication problems
     switch $result(update_status) {
         ok {