165a93e2 by Kevin Burton

Refs #990

1 parent 18e04373
......@@ -83,7 +83,7 @@ function get_users($role = null, $pagenum=1, $records_per_page=0, $return_count_
if ($search) {
$search = strip_tags($search);
$search_text = "AND (uml.meta_value LIKE '%$search%' OR umf.meta_value LIKE '%$search%')";
$search_text = "AND (uml.meta_value LIKE '%$search%' OR umf.meta_value LIKE '%$search%' OR umm.meta_value LIKE '%$search%' OR u.user_email LIKE '%$search%' OR u.user_login LIKE '%$search%')";
} else {
$search_text = "";
}
......@@ -105,11 +105,12 @@ function get_users($role = null, $pagenum=1, $records_per_page=0, $return_count_
SELECT
COUNT(*)
FROM
{$wpdb->users} as u, {$wpdb->usermeta} as uml, {$wpdb->usermeta} as umf, {$wpdb->usermeta} as ums $extra_table
{$wpdb->users} as u, {$wpdb->usermeta} as uml, {$wpdb->usermeta} as umf, {$wpdb->usermeta} as ums $extra_table, {$wpdb->usermeta} as umm
WHERE
(uml.user_id=u.ID AND uml.meta_key='last_name')
AND (umf.user_id=u.ID AND umf.meta_key='first_name')
AND (ums.user_id=u.ID AND ums.meta_key='status')
AND (umm.user_id=u.ID AND umm.meta_key='member_id')
$filter
$search_text";
......@@ -120,11 +121,12 @@ function get_users($role = null, $pagenum=1, $records_per_page=0, $return_count_
SELECT
u.ID, u.user_login, user_email, uml.meta_value as last_name, umf.meta_value as first_name
FROM
{$wpdb->users} as u, {$wpdb->usermeta} as uml, {$wpdb->usermeta} as umf, {$wpdb->usermeta} as ums $extra_table
{$wpdb->users} as u, {$wpdb->usermeta} as uml, {$wpdb->usermeta} as umf, {$wpdb->usermeta} as ums $extra_table, {$wpdb->usermeta} as umm
WHERE
(uml.user_id=u.ID AND uml.meta_key='last_name')
AND (umf.user_id=u.ID AND umf.meta_key='first_name')
AND (ums.user_id=u.ID AND ums.meta_key='status')
AND (umm.user_id=u.ID AND umm.meta_key='member_id')
$filter
$search_text
ORDER BY last_name ASC, first_name ASC
......