| @@ -653,18 +653,18 @@ | ||
| 653 | 653 | |
| 654 | 654 | if ($saved_instructors){ |
| 655 | 655 | $saved_instructors_ids = wp_list_pluck($saved_instructors, 'ID'); |
| 656 | 656 | $instructor_not_in_ids = implode(',', $saved_instructors_ids); |
| 657 | - $not_in_sql .= "AND ID NOT IN($instructor_not_in_ids) "; | |
| 657 | + $not_in_sql .= "AND user.ID NOT IN($instructor_not_in_ids) "; | |
| 658 | 658 | } |
| 659 | 659 | |
| 660 | 660 | $search_sql = ''; |
| 661 | 661 | if ($search_terms){ |
| 662 | - $search_sql = "AND (user_login like '%{$search_terms}%' or user_nicename like '%{$search_terms}%' or display_name like '%{$search_terms}%') "; | |
| 662 | + $search_sql = "AND (user.user_login like '%{$search_terms}%' or user.user_nicename like '%{$search_terms}%' or user.display_name like '%{$search_terms}%') "; | |
| 663 | 663 | } |
| 664 | 664 | |
| 665 | - $instructors = $wpdb->get_results("select ID, display_name from {$wpdb->users} | |
| 666 | - INNER JOIN {$wpdb->usermeta} ON ID = user_id AND meta_key = '_tutor_instructor_status' AND meta_value = 'approved' | |
| 665 | + $instructors = $wpdb->get_results("SELECT user.ID, user.display_name from {$wpdb->users} user | |
| 666 | + INNER JOIN {$wpdb->usermeta} meta ON user.ID = meta.user_id AND meta.meta_key = '_tutor_instructor_status' AND meta.meta_value = 'approved' | |
| 667 | 667 | WHERE 1=1 {$not_in_sql} {$search_sql} limit 10 "); |
| 668 | 668 | |
| 669 | 669 | $output = ''; |
| 670 | 670 | if (is_array($instructors) && count($instructors)){ |