tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-5832-10030-Faltan-campos-en-API-Events' into 'develop' 

fixed bug in get_events_with_user call

See merge request artica/pandorafms!3213
This commit is contained in:
Daniel Rodriguez 2020-06-25 12:21:27 +02:00
parent 0079f5d3b5 ee55c1be85
commit ae0ac8dc8c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_api.php
View File

@ -10723,7 +10723,7 @@ function get_events_with_user($trash1, $trash2, $other, $returnType, $user_in_db
$data['type'] = 'array';
$data['data'] = $result;
// returnData($returnType, $data, $separator);
returnData($returnType, $data, $separator);
if (empty($result)) {
return false;
}
@ -10840,6 +10840,8 @@ function api_get_events($trash1, $trash2, $other, $returnType, $user_in_db=null)
returnError('ERROR_API_PANDORAFMS', $returnType);
}
}
return;
}
if ($other['type'] == 'string') {