4 commits - plugins/calendar plugins/libkolab

[Thomas Brüderli]

 plugins/calendar/skins/larry/templates/eventedit.html |    2 +-
 plugins/libkolab/lib/kolab_storage_folder.php         |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f5824e32b4ce1c4c25ae4a9d9873195e4b138ce5
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Jun 20 10:45:24 2012 +0200

    Catch format errors when trying to write an object of invalid or unknown type

diff --git a/plugins/libkolab/lib/kolab_storage_folder.php b/plugins/libkolab/lib/kolab_storage_folder.php
index df5e811..1a522be 100644
--- a/plugins/libkolab/lib/kolab_storage_folder.php
+++ b/plugins/libkolab/lib/kolab_storage_folder.php
@@ -665,6 +665,9 @@ class kolab_storage_folder
         if (!$format)
             $format = kolab_format::factory($type);
 
+        if (PEAR::isError($format))
+            return false;
+
         $format->set($object);
         $xml = $format->write();
         $object['uid'] = $format->uid;  // read UID from format


commit 5756c25276c45fe0aafac961c8b84bec45dcfdaa
Merge: 365f2ed ce61543
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Jun 18 10:34:01 2012 +0200

    Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube



commit 365f2eda2d032d01d2a727677788ace055029efe
Merge: 0e9fd5d c7c608a
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Jun 13 17:58:32 2012 +0200

    Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube



commit 0e9fd5da0c2acf1b01a7347dbb531ed50de62be2
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Jun 13 17:54:35 2012 +0200

    No cancelIcon in Larry, use css styled text link instead

diff --git a/plugins/calendar/skins/larry/templates/eventedit.html b/plugins/calendar/skins/larry/templates/eventedit.html
index a3f58e8..e169c85 100644
--- a/plugins/calendar/skins/larry/templates/eventedit.html
+++ b/plugins/calendar/skins/larry/templates/eventedit.html
@@ -86,7 +86,7 @@
 		<!-- attachments list (with upload form) -->
 		<div id="event-tab-4">
 			<div id="edit-attachments">
-				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" cancelIcon="/images/0.gif" />
+				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
 			</div>
 			<div id="edit-attachments-form">
 				<roundcube:object name="plugin.attachments_form" id="calendar-attachment-form" attachmentFieldSize="30" />