diff options
| author | Cesar G <prototech91@gmail.com> | 2015-10-22 10:05:25 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2015-10-22 10:05:25 -0700 |
| commit | a246cb6414ed1c3a0de2238b11ee28fe777092f2 (patch) | |
| tree | 6175318a2ada6a44749e305fbc6e8e5c12cb3b37 /phpBB | |
| parent | cc1a96a8045b6abe5b1234afb045912d53669fee (diff) | |
| parent | 5576c9f3b907458081633d53d449faba2ae181d3 (diff) | |
| download | forums-a246cb6414ed1c3a0de2238b11ee28fe777092f2.tar forums-a246cb6414ed1c3a0de2238b11ee28fe777092f2.tar.gz forums-a246cb6414ed1c3a0de2238b11ee28fe777092f2.tar.bz2 forums-a246cb6414ed1c3a0de2238b11ee28fe777092f2.tar.xz forums-a246cb6414ed1c3a0de2238b11ee28fe777092f2.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/14249] Fix online list order
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b7a5bee3c4..d4f662626e 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3624,7 +3624,7 @@ function obtain_users_online_string($online_users, $item_id = 0, $item = 'forum' USERS_TABLE => 'u', ), 'WHERE' => $db->sql_in_set('u.user_id', $online_users['online_users']), - 'ORDER BY' => 'u.username_clean ASC', + 'ORDER_BY' => 'u.username_clean ASC', ); /** |