Index: openacs-4/packages/contacts/lib/contacts-aggregated.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts-aggregated.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/contacts/lib/contacts-aggregated.tcl	15 Nov 2005 15:56:46 -0000	1.6
+++ openacs-4/packages/contacts/lib/contacts-aggregated.tcl	15 Nov 2005 16:27:40 -0000	1.7
@@ -67,9 +67,9 @@
 # we add the element dynamically to the list
 set extend_pretty_name ""
 if { [exists_and_not_null extend_id] } {
-    set extend_info [db_list_of_lists get_extend_name { }]
-    set extend_pretty_name [lindex [lindex $extend_info 0] 0]
-    set extend_var_name    [lindex [lindex $extend_info 0] 1]
+    set extend_info [contact::extend::option_info -extend_id $extend_id]
+    set extend_var_name    [lindex [lindex $extend_info 0] 0]
+    set extend_pretty_name [lindex [lindex $extend_info 0] 1]
     set extend_subquery    [lindex [lindex $extend_info 0] 2]
     set elements [list \
 		      option [list \
Index: openacs-4/packages/contacts/lib/contacts-aggregated.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts-aggregated.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/contacts/lib/contacts-aggregated.xql	15 Nov 2005 15:56:46 -0000	1.5
+++ openacs-4/packages/contacts/lib/contacts-aggregated.xql	15 Nov 2005 16:27:40 -0000	1.6
@@ -161,19 +161,6 @@
     </querytext>
 </fullquery>
 
-<fullquery name="get_extend_name">
-    <querytext>
-	select
-		pretty_name,
-		var_name,
-		subquery
-	from 
-		contact_extend_options
-	where 
-		extend_id = :extend_id
-    </querytext>
-</fullquery>
-
 <fullquery name="get_extend_results">
     <querytext>
 	$extend_subquery