Index: openacs-4/packages/acs-authentication/tcl/local-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/local-procs.tcl,v
diff -u -r1.47.2.3 -r1.47.2.4
--- openacs-4/packages/acs-authentication/tcl/local-procs.tcl	22 Feb 2021 19:00:04 -0000	1.47.2.3
+++ openacs-4/packages/acs-authentication/tcl/local-procs.tcl	29 Apr 2021 07:14:40 -0000	1.47.2.4
@@ -639,14 +639,16 @@
     Implements the Search operation of the auth_search
     service contract for the local account implementation.
 } {
-
-    set results [list]
-    db_foreach user_search {} {
-        lappend results $user_id
-    }
-
-    return $results
-
+    return [db_list user_search {
+        select distinct user_id
+        from   cc_users u
+        where  upper(coalesce(u.first_names || ' ', '')  ||
+               coalesce(u.last_name || ' ', '') ||
+               u.email || ' ' ||
+               u.username || ' ' ||
+               coalesce(u.screen_name, '')) like upper('%'||:search_text||'%')
+        order  by username, email
+    }]
 }
 
 ad_proc -private auth::local::search::GetParameters {} {
Index: openacs-4/packages/acs-authentication/tcl/local-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/local-procs.xql,v
diff -u -r1.3 -r1.3.12.1
--- openacs-4/packages/acs-authentication/tcl/local-procs.xql	8 Sep 2008 20:14:58 -0000	1.3
+++ openacs-4/packages/acs-authentication/tcl/local-procs.xql	29 Apr 2021 07:14:40 -0000	1.3.12.1
@@ -8,20 +8,6 @@
       </querytext>
     </fullquery>
 
-<fullquery name="auth::local::search::Search.user_search">      
-      <querytext>
-            select distinct user_id, username, email
-            from   cc_users u
-            where  upper(coalesce(u.first_names || ' ', '')  ||
-                   coalesce(u.last_name || ' ', '') ||
-                   u.email || ' ' ||
-                   u.username || ' ' ||
-                   coalesce(u.screen_name, '')) like upper('%'||:search_text||'%')
-            order  by username, email
-
-      </querytext>
-</fullquery>
-
 <fullquery name="auth::local::user_info::GetUserInfo.get_user_info">      
       <querytext>
             select user_id, first_names, last_name, username, email