extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid type error when importing events with IDs that cannot be read (no permission)

Browse Source 
Argument 1 passed to calendar_tracking::changed_fields() must be of the type array, null given
This commit is contained in:
nathangray 2016-07-25 12:23:31 -06:00
parent 085ac5bb38
commit 0405eb1510
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
calendar/inc/class.calendar_import_csv.inc.php
View File

@ -275,10 +275,13 @@ class calendar_import_csv extends importexport_basic_import_csv {
}
// Merge to deal with fields not in import record
$_data = array_merge($old, $_data);
$changed = $this->tracking->changed_fields($_data, $old);
if(count($changed) == 0) {
return true;
if($old)
{
$_data = array_merge($old, $_data);
$changed = $this->tracking->changed_fields($_data, $old);
if(count($changed) == 0) {
return true;
}
}
// Fall through
case 'insert' :