diff options
| author | Thomas Bruederli <bruederli@kolabsys.com> | 2013-11-11 08:37:12 (GMT) |
|---|---|---|
| committer | Thomas Bruederli <bruederli@kolabsys.com> | 2013-11-11 08:53:27 (GMT) |
| commit | 6aa9b688cb41ddf4c4b06505dac9cd0e274cffb0 (patch) | |
| tree | c4944d19acf0b5dff34ed2bfbeec17839c2c3168 | |
| parent | 963f304365c9b22418e044d46188d3cfc7c1771a (diff) | |
| download | roundcubemail-plugins-kolab-roundcubemail-plugins-kolab-3.1.7.tar.gz | |
Avoid empty tags (#2496)roundcubemail-plugins-kolab-3.1.7
| -rw-r--r-- | plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php | 2 | ||||
| -rw-r--r-- | plugins/tasklist/tasklist.php | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php index fd3e5c3..8fdaedb 100644 --- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php +++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php @@ -597,7 +597,7 @@ class tasklist_kolab_driver extends tasklist_driver 'title' => $record['title'], # 'location' => $record['location'], 'description' => $record['description'], - 'tags' => (array)$record['categories'], + 'tags' => array_filter((array)$record['categories']), 'flagged' => $record['priority'] == 1, 'complete' => $record['status'] == 'COMPLETED' ? 1 : floatval($record['complete'] / 100), 'parent_id' => $record['parent_id'], diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php index e77bccc..94cf4bb 100644 --- a/plugins/tasklist/tasklist.php +++ b/plugins/tasklist/tasklist.php @@ -387,6 +387,11 @@ class tasklist extends rcube_plugin } } + // convert tags to array, filter out empty entries + if (isset($rec['tags']) && !is_array($rec['tags'])) { + $rec['tags'] = array_filter((array)$rec['tags']); + } + // alarms cannot work without a date if ($rec['alarms'] && !$rec['date'] && !$rec['startdate'] && strpos($rec['alarms'], '@') === false) $rec['alarms'] = ''; |