From 4f2736373a89f65e544f2ae62979cd471089d7fe Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Wed, 18 Mar 2015 20:23:28 +0100
Subject: [PATCH] Fix event changelog dialog handling

---
 plugins/calendar/calendar_ui.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index b3bfbe0c..ba0760fd 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -1022,7 +1022,7 @@ function rcube_calendar_ui(settings)
         return false
 
       // render dialog
-      $dialog = $('#eventhistory');
+      var $dialog = $('#eventhistory');
 
       // close show dialog first
       if ($dialog.is(':ui-dialog'))
@@ -1034,7 +1034,7 @@ function rcube_calendar_ui(settings)
       };
 
       // hide and reset changelog table
-      $('div.event-dialog-message').remove();
+      $dialog.find('div.event-dialog-message').remove();
       $('#event-changelog-table').show().children('tbody')
         .html('<tr><td colspan="6"><span class="loading">'+ rcmail.gettext('loading') +'</span></td></tr>');
 
@@ -1143,8 +1143,8 @@ function rcube_calendar_ui(settings)
         change = data[i];
         accessible = change.date && change.user;
 
-        if (change.op == 'MOVE' && change.folder) {
-          op_append = ' ⇢ ' + change.folder;
+        if (change.op == 'MOVE' && change.mailbox) {
+          op_append = ' ⇢ ' + change.mailbox;
         }
         else {
           op_append = '';