Merge branch '3.1.x'

* 3.1.x:
  [ticket/14249] Fix online list order
This commit is contained in:
Cesar G 2015-10-22 10:05:25 -07:00
commit a246cb6414

View file

@ -3624,7 +3624,7 @@ function obtain_users_online_string($online_users, $item_id = 0, $item = 'forum'
USERS_TABLE => 'u', USERS_TABLE => 'u',
), ),
'WHERE' => $db->sql_in_set('u.user_id', $online_users['online_users']), 'WHERE' => $db->sql_in_set('u.user_id', $online_users['online_users']),
'ORDER BY' => 'u.username_clean ASC', 'ORDER_BY' => 'u.username_clean ASC',
); );
/** /**