diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-11 10:32:53 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-11 10:32:53 +0200 |
| commit | b832ebe7185296f6164ce9472a683c0bf45aa98a (patch) | |
| tree | a1c09cf146a26f4823a5e07dcf81210d400f8946 /phpBB/includes | |
| parent | 6664dbb5863fe7fe730437fc44a53a817acaf1c0 (diff) | |
| parent | eb6b877330f5a976c152404f83683bf93fc045ce (diff) | |
| download | forums-b832ebe7185296f6164ce9472a683c0bf45aa98a.tar forums-b832ebe7185296f6164ce9472a683c0bf45aa98a.tar.gz forums-b832ebe7185296f6164ce9472a683c0bf45aa98a.tar.bz2 forums-b832ebe7185296f6164ce9472a683c0bf45aa98a.tar.xz forums-b832ebe7185296f6164ce9472a683c0bf45aa98a.zip | |
Merge remote-tracking branch 'vsephpbb/ticket/12380' into develop-ascraeus
* vsephpbb/ticket/12380:
[ticket/12380] Explicity state the order of sorting for login keys
[ticket/12380] Sort Remember Me keys by last login time in UCP
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index a14f79f9fd..00b53b6576 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -672,7 +672,8 @@ class ucp_profile $sql = 'SELECT key_id, last_ip, last_login 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); |