Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12380] Explicity state the order of sorting for login keys
  [ticket/12380] Sort Remember Me keys by last login time in UCP
This commit is contained in:
Joas Schilling 2014-04-11 10:33:12 +02:00
commit dcd35c11ce

View file

@ -672,7 +672,8 @@ class ucp_profile
$sql = 'SELECT key_id, last_ip, last_login $sql = 'SELECT key_id, last_ip, last_login
FROM ' . SESSIONS_KEYS_TABLE . ' FROM ' . SESSIONS_KEYS_TABLE . '
WHERE user_id = ' . (int) $user->data['user_id']; WHERE user_id = ' . (int) $user->data['user_id'] . '
ORDER BY last_login ASC';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);