plugins/tasklist

Thomas Brüderli bruederli at kolabsys.com
Wed Mar 25 16:37:08 CET 2015


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

New commits:
commit f96e93eec29ea1686a30a4986006d2eef9f46295
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Mar 25 16:37:04 2015 +0100

    Fix loading attachments from old revisions

diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
index 8ba59de..9000d8f 100644
--- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
+++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
@@ -717,8 +717,9 @@ class tasklist_kolab_driver extends tasklist_driver
             $format->get_attachments($rec, true);
 
             if ($format->is_valid()) {
+                $rec = self::_to_rcube_task($rec, $list_id, false);
                 $rec['rev'] = $result['rev'];
-                return self::_to_rcube_task($rec, $list_id, false);
+                return $rec;
             }
         }
 
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 514d060..d31a26d 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -2575,7 +2575,7 @@ function rcube_tasklist_ui(settings)
 
         var query = { _id: att.id, _t: rec.recurrence_id||rec.id, _list:rec.list, _frame: 1 };
         if (rec.rev)
-            query._rev = event.rev;
+            query._rev = rec.rev;
 
 
         // open attachment in frame if it's of a supported mimetype




More information about the commits mailing list