Branch 'dev/libcalendaring' - 2 commits - plugins/libkolab plugins/tasklist

[Thomas Brüderli]

 plugins/libkolab/lib/kolab_format_event.php              |    2 +-
 plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3cff4556329849bb8939c1c2de03362e42d13bad
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Nov 8 16:18:54 2012 +0100

    Ignore empty attachments from format v2

diff --git a/plugins/libkolab/lib/kolab_format_event.php b/plugins/libkolab/lib/kolab_format_event.php
index 838f37d..6094c6a 100644
--- a/plugins/libkolab/lib/kolab_format_event.php
+++ b/plugins/libkolab/lib/kolab_format_event.php
@@ -147,7 +147,7 @@ class kolab_format_event extends kolab_format_xcal
             $attach = $vattach->get($i);
 
             // skip cid: attachments which are mime message parts handled by kolab_storage_folder
-            if (substr($attach->uri(), 0, 4) != 'cid') {
+            if (substr($attach->uri(), 0, 4) != 'cid' && $attach->label()) {
                 $name = $attach->label();
                 $data = $attach->data();
                 $object['_attachments'][$name] = array(


commit 0c418da7908806a4ee89fad56a814fa7939c1175
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Nov 8 16:18:28 2012 +0100

    Don't set due time if dateonly

diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
index 0f9d35d..f6ebe14 100644
--- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
+++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
@@ -548,7 +548,8 @@ class tasklist_kolab_driver extends tasklist_driver
         // convert from DateTime to internal date format
         if (is_a($record['due'], 'DateTime')) {
             $task['date'] = $record['due']->format('Y-m-d');
-            $task['time'] = $record['due']->format('h:i');
+            if (!$record['due']->_dateonly)
+            	$task['time'] = $record['due']->format('h:i');
         }
         // convert from DateTime to internal date format
         if (is_a($record['start'], 'DateTime')) {