Skip to content

Tenzing / Tz Tools

Go to a project
Toggle navigation
Toggle navigation pinning
165a93e2 by Kevin Burton
Options

Refs #990

1 parent 18e04373
Inline Side-by-side
Showing 1 changed file with 5 additions and 3 deletions
...@@ -83,7 +83,7 @@ function get_users($role = null, $pagenum=1, $records_per_page=0, $return_count_ ...@@ -83,7 +83,7 @@ function get_users($role = null, $pagenum=1, $records_per_page=0, $return_count_
83 83
84 if ($search) { 84 if ($search) {
85 $search = strip_tags($search); 85 $search = strip_tags($search);
86 $search_text = "AND (uml.meta_value LIKE '%$search%' OR umf.meta_value LIKE '%$search%')"; 86 $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%')";
87 } else { 87 } else {
88 $search_text = ""; 88 $search_text = "";
89 } 89 }
...@@ -105,11 +105,12 @@ function get_users($role = null, $pagenum=1, $records_per_page=0, $return_count_ ...@@ -105,11 +105,12 @@ function get_users($role = null, $pagenum=1, $records_per_page=0, $return_count_
105 SELECT 105 SELECT
106 COUNT(*) 106 COUNT(*)
107 FROM 107 FROM
108 {$wpdb->users} as u, {$wpdb->usermeta} as uml, {$wpdb->usermeta} as umf, {$wpdb->usermeta} as ums $extra_table 108 {$wpdb->users} as u, {$wpdb->usermeta} as uml, {$wpdb->usermeta} as umf, {$wpdb->usermeta} as ums $extra_table, {$wpdb->usermeta} as umm
109 WHERE 109 WHERE
110 (uml.user_id=u.ID AND uml.meta_key='last_name') 110 (uml.user_id=u.ID AND uml.meta_key='last_name')
111 AND (umf.user_id=u.ID AND umf.meta_key='first_name') 111 AND (umf.user_id=u.ID AND umf.meta_key='first_name')
112 AND (ums.user_id=u.ID AND ums.meta_key='status') 112 AND (ums.user_id=u.ID AND ums.meta_key='status')
113 AND (umm.user_id=u.ID AND umm.meta_key='member_id')
113 $filter 114 $filter
114 $search_text"; 115 $search_text";
115 116
...@@ -120,11 +121,12 @@ function get_users($role = null, $pagenum=1, $records_per_page=0, $return_count_ ...@@ -120,11 +121,12 @@ function get_users($role = null, $pagenum=1, $records_per_page=0, $return_count_
120 SELECT 121 SELECT
121 u.ID, u.user_login, user_email, uml.meta_value as last_name, umf.meta_value as first_name 122 u.ID, u.user_login, user_email, uml.meta_value as last_name, umf.meta_value as first_name
122 FROM 123 FROM
123 {$wpdb->users} as u, {$wpdb->usermeta} as uml, {$wpdb->usermeta} as umf, {$wpdb->usermeta} as ums $extra_table 124 {$wpdb->users} as u, {$wpdb->usermeta} as uml, {$wpdb->usermeta} as umf, {$wpdb->usermeta} as ums $extra_table, {$wpdb->usermeta} as umm
124 WHERE 125 WHERE
125 (uml.user_id=u.ID AND uml.meta_key='last_name') 126 (uml.user_id=u.ID AND uml.meta_key='last_name')
126 AND (umf.user_id=u.ID AND umf.meta_key='first_name') 127 AND (umf.user_id=u.ID AND umf.meta_key='first_name')
127 AND (ums.user_id=u.ID AND ums.meta_key='status') 128 AND (ums.user_id=u.ID AND ums.meta_key='status')
129 AND (umm.user_id=u.ID AND umm.meta_key='member_id')
128 $filter 130 $filter
129 $search_text 131 $search_text
130 ORDER BY last_name ASC, first_name ASC 132 ORDER BY last_name ASC, first_name ASC
......