Fix query in UserManager::get_user_list

pull/2487/head
jmontoyaa 9 years ago
parent f0dfe5c41b
commit bc22a13e7a
  1. 3
      main/inc/lib/myspace.lib.php
  2. 8
      main/inc/lib/usermanager.lib.php

@ -1869,7 +1869,6 @@ class MySpace
*/
public static function get_user_data_tracking_overview($from, $numberItems, $column, $direction)
{
$conditions = [];
$isWestern = api_is_western_name_order();
switch ($column) {
case '0':
@ -1892,7 +1891,7 @@ class MySpace
$order = [
"$column $direction"
];
$userList = UserManager::get_user_list($conditions, $order, $from, $numberItems);
$userList = UserManager::get_user_list([], $order, $from, $numberItems);
$return = [];
foreach ($userList as $user) {
$firstPosition = $user['lastname'];

@ -1377,7 +1377,6 @@ class UserManager
public static function get_user_list_by_ids($ids = array(), $active = null, $order = null, $limit = null)
{
if (empty($ids)) {
return array();
}
@ -1419,8 +1418,8 @@ class UserManager
* @todo security filter order by
*/
public static function get_user_list(
$conditions = array(),
$order_by = array(),
$conditions = [],
$order_by = [],
$limit_from = false,
$limit_to = false
) {
@ -1439,9 +1438,10 @@ class UserManager
foreach ($conditions as $field => $value) {
$field = Database::escape_string($field);
$value = Database::escape_string($value);
$sql .= "$field = '$value'";
$sql .= " AND $field = '$value'";
}
}
if (count($order_by) > 0) {
$sql .= ' ORDER BY '.Database::escape_string(implode(',', $order_by), null, false);
}

Loading…
Cancel
Save