2 commits - plugins/calendar

[Thomas Brüderli]

 plugins/calendar/calendar_ui.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ccd75c9ac1bc1e1a97c00dcb8857b560bdc4ea8a
Merge: 0ee3add c5f31be
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Tue Jul 17 13:53:29 2012 +0200

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



commit 0ee3add26825d8292f5dd81ca49e69bb9fa2b4ab
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Tue Jul 17 13:52:27 2012 +0200

    Grep events by (u)id AND source (#880)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index ba52c25..07c3a0c 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -2006,7 +2006,7 @@ function rcube_calendar_ui(settings)
         var event = p.update;
         event.temp = false;
         event.editable = source.editable;
-        var existing = fc.fullCalendar('clientEvents', event.id);
+        var existing = fc.fullCalendar('clientEvents', function(e){ return (e.id == event.id && e.calendar == event.calendar); });
         if (existing.length) {
           $.extend(existing[0], event);
           fc.fullCalendar('updateEvent', existing[0]);