Fix 'prevent_session_admins_to_manage_all_users' feature - refs BT#9324

main/admin/add_users_to_session.php

@@ -96,13 +96,6 @@ function search_users($needle, $type)
             $order_clause = ' ORDER BY official_code, firstname, lastname, username';
         }
 
-        if (api_is_session_admin()
-            && isset($_configuration['prevent_session_admins_to_manage_all_users'])
-            && $_configuration['prevent_session_admins_to_manage_all_users'] == 'true'
-        ) {
-            $order_clause = " AND user.creator_id = " . api_get_user_id() . $order_clause;
-        }
-
         $cond_user_id = '';
 
         // Only for single & multiple
@@ -432,7 +425,12 @@ if ($ajax_search) {
             }
         }
     }
-
+    if (api_is_session_admin()
+        && isset($_configuration['prevent_session_admins_to_manage_all_users'])
+        && $_configuration['prevent_session_admins_to_manage_all_users'] == 'true'
+    ) {
+        $order_clause = " AND u.creator_id = " . api_get_user_id() . $order_clause;
+    }
     if ($use_extra_fields) {
         $sql = "SELECT  user_id, lastname, firstname, username, id_session, official_code
                FROM $tbl_user u