extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-30 18:49:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

async_data is NOT NULL, therefore we should not attempt to write a NULL, even if most MySQL servers dont complain

Browse Source
This commit is contained in:
Ralf Becker 2016-02-20 15:17:12 +00:00
parent c3a99d13a0
commit 27fc9a48d2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpgwapi/inc/class.asyncservice.inc.php
View File

@ -511,7 +511,8 @@ class asyncservice
} }
else else
{ {
$row['async_data'] = json_php_unserialize($row['async_data'], true); // allow non-serialized data $row['async_data'] = !empty($row['async_data']) ?
json_php_unserialize($row['async_data'], true) : null; // allow non-serialized data
} }
$jobs[$row['async_id']] = egw_db::strip_array_keys($row,'async_'); $jobs[$row['async_id']] = egw_db::strip_array_keys($row,'async_');
} }
@ -539,7 +540,7 @@ class asyncservice
'async_next' => $job['next'], 'async_next' => $job['next'],
'async_times' => json_encode($job['times']), 'async_times' => json_encode($job['times']),
'async_method' => $job['method'], 'async_method' => $job['method'],
'async_data' => $job['data'] ? json_encode($job['data']) : null, 'async_data' => $job['data'] ? json_encode($job['data']) : '',
'async_account_id'=> $job['account_id'], 'async_account_id'=> $job['account_id'],
); );
$where['async_id'] = $job['id']; $where['async_id'] = $job['id'];