adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-06 16:53:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes #674, by default user groups should be an empty array, not an empty string

Browse Source
This commit is contained in:
plegall
2017-05-05 11:00:53 +02:00
parent b56832c873
commit 1c71e59303
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ws_functions/pwg.users.php
+4 -5
View File
@@ -149,11 +149,6 @@ SELECT DISTINCT ';
else $first = false; else $first = false;
$query.= $field .' AS '. $name; $query.= $field .' AS '. $name;
} }
if (isset($params['display']['groups']))
{
if (!$first) $query.= ', ';
$query.= '"" AS groups';
}
if (isset($display['ui.last_visit'])) if (isset($display['ui.last_visit']))
{ {
@@ -179,6 +174,10 @@ SELECT DISTINCT ';
while ($row = pwg_db_fetch_assoc($result)) while ($row = pwg_db_fetch_assoc($result))
{ {
$row['id'] = intval($row['id']); $row['id'] = intval($row['id']);
if (isset($params['display']['groups']))
{
$row['groups'] = array(); // will be filled later
}
$users[ $row['id'] ] = $row; $users[ $row['id'] ] = $row;
} }