mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-20 04:32:01 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3265 from SimSync/fix_3239

Browse Source 
Fixes #3239 The array merge didn't work correctly by using the + operator
This commit is contained in:
Cameron 2018-07-11 11:40:50 -07:00 committed by GitHub
commit 4c692150fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
e107_plugins/user/e_dashboard.php
View File

@ -422,8 +422,9 @@ class user_dashboard // plugin-folder + '_url'
<tbody>";
$online = $ol->userList() + $ol->guestList();
// Fixes #3239: The array merge didn't work correctly by using the + operator
$online = $ol->userList();
$online = array_merge($online, $ol->guestList());
if($data == 'count')
{