Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix PHP Warning: count(): Parameter must be an array or an object that implements Countable

Browse source
This commit is contained in:
Aleksander Machniak 2019-09-25 20:39:02 +02:00
parent ad33b48521
commit 6135612024
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/calendar/calendar.php
View file

@ -2459,17 +2459,20 @@ class calendar extends rcube_plugin
*/
public static function event_diff($a, $b)
{
$diff = array();
$diff = array();
$ignore = array('changed' => 1, 'attachments' => 1);
foreach (array_unique(array_merge(array_keys($a), array_keys($b))) as $key) {
if (!$ignore[$key] && $key[0] != '_' && $a[$key] != $b[$key])
if (!$ignore[$key] && $key[0] != '_' && $a[$key] != $b[$key]) {
$diff[] = $key;
}
}
// only compare number of attachments
if (count($a['attachments']) != count($b['attachments']))
if (count((array) $a['attachments']) != count((array) $b['attachments'])) {
$diff[] = 'attachments';
}
return $diff;
}