Fix efficiency issue caused by query still querying the user.user_id field while it is not indexed anymore under the new structure

main/group/group_space.php

@@ -401,7 +401,7 @@ function get_group_user_data($from, $number_of_items, $column, $direction)
 
     // Query
     if (api_get_setting('show_email_addresses') == 'true') {
-        $sql = "SELECT user.user_id 	AS col0,
+        $sql = "SELECT user.id 	AS col0,
 				".(api_is_western_name_order() ?
                 "user.firstname 	AS col1,
 				user.lastname 	AS col2,"
@@ -411,14 +411,14 @@ function get_group_user_data($from, $number_of_items, $column, $direction)
             )."
 				user.email		AS col3
 				FROM ".$table_user." user, ".$table_group_user." group_rel_user
-				WHERE group_rel_user.c_id = $course_id AND group_rel_user.user_id = user.user_id
+				WHERE group_rel_user.c_id = $course_id AND group_rel_user.user_id = user.id
 				AND group_rel_user.group_id = '".Database::escape_string($current_group['id'])."'";
         $sql .= " ORDER BY col$column $direction ";
         $sql .= " LIMIT $from,$number_of_items";
     } else {
         if (api_is_allowed_to_edit()) {
             $sql = "SELECT DISTINCT
-						u.user_id 	AS col0,
+						u.id 	AS col0,
 						".(api_is_western_name_order() ?
                     "u.firstname 	AS col1,
 						u.lastname 	AS col2,"
@@ -427,13 +427,13 @@ function get_group_user_data($from, $number_of_items, $column, $direction)
 						u.firstname 	AS col2,"
                 )."
 						u.email		AS col3
-						FROM ".$table_user." u INNER JOIN ".$table_group_user." gu ON (gu.user_id = u.user_id) AND gu.c_id = $course_id
+						FROM ".$table_user." u INNER JOIN ".$table_group_user." gu ON (gu.user_id = u.id) AND gu.c_id = $course_id
 						WHERE gu.group_id = '".Database::escape_string($current_group['id'])."'";
             $sql .= " ORDER BY col$column $direction ";
             $sql .= " LIMIT $from,$number_of_items";
         } else {
             $sql = "SELECT DISTINCT
-						user.user_id 	AS col0,
+						user.id 	AS col0,
 						". (api_is_western_name_order() ?
                     "user.firstname 	AS col1,
 						user.lastname 	AS col2 "
@@ -442,7 +442,7 @@ function get_group_user_data($from, $number_of_items, $column, $direction)
 						user.firstname 	AS col2 "
                 )."
 						FROM ".$table_user." user, ".$table_group_user." group_rel_user
-						WHERE group_rel_user.c_id = $course_id AND  group_rel_user.user_id = user.user_id
+						WHERE group_rel_user.c_id = $course_id AND  group_rel_user.user_id = user.id
 						AND group_rel_user.group_id = '".Database::escape_string($current_group['id'])."'";
             $sql .= " ORDER BY col$column $direction ";
             $sql .= " LIMIT $from,$number_of_items";

main/inc/lib/api.lib.php

@@ -1444,6 +1444,7 @@ function _api_format_user($user, $add_password = false)
         $result['email'] = isset($user['mail'])? $user['mail'] : null;
     }
     $user_id = intval($user['user_id']);
+    // Maintain the user_id index for backwards compatibility
     $result['user_id'] = $result['id'] = $user_id;
     $saveUserLastLogin = api_get_configuration_value('save_user_last_login');