2 commits - plugins/kolab_notes

[Thomas Brüderli]

 plugins/kolab_notes/kolab_notes.php    |    6 +-----
 plugins/kolab_notes/kolab_notes_ui.php |    1 +
 plugins/kolab_notes/notes.js           |    1 +
 3 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 4f5e10cfc0199dfe09ddb4b28291b38fd286497d
Merge: 015ef6c 52e5cd3
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Apr 16 09:43:02 2014 +0200

    Merge branch 'master' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab



commit 015ef6cd6b87e8591104e5a1b8b15f5d462c386e
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Apr 16 09:42:52 2014 +0200

    Fix attachment/message links; avoid double-escaping of folder names in drop-down list

diff --git a/plugins/kolab_notes/kolab_notes.php b/plugins/kolab_notes/kolab_notes.php
index 2c47855..6442a71 100644
--- a/plugins/kolab_notes/kolab_notes.php
+++ b/plugins/kolab_notes/kolab_notes.php
@@ -261,11 +261,7 @@ class kolab_notes extends rcube_plugin
                 $this->rc->output->set_env('kolab_notes_template', array(
                     '_from_mail' => true,
                     'title' => $message->get('subject'),
-                    'links' => array(array(
-                        'uri' => $this->get_message_uri($message, $folder),
-                        'message_id' => $message->get('message-id'),
-                        'subject' => $message->get('subject'),
-                    )),
+                    'links' => array($this->get_message_reference($this->get_message_uri($message, $folder))),
                 ));
             }
         }
diff --git a/plugins/kolab_notes/kolab_notes_ui.php b/plugins/kolab_notes/kolab_notes_ui.php
index bbb3ca7..770d304 100644
--- a/plugins/kolab_notes/kolab_notes_ui.php
+++ b/plugins/kolab_notes/kolab_notes_ui.php
@@ -97,6 +97,7 @@ class kolab_notes_ui
         $attrib += array('id' => 'rcmkolabnotebooks');
 
         if ($attrib['type'] == 'select') {
+            $attrib['is_escaped'] = true;
             $select = new html_select($attrib);
         }
 
diff --git a/plugins/kolab_notes/notes.js b/plugins/kolab_notes/notes.js
index 41dcac1..23b8d3e 100644
--- a/plugins/kolab_notes/notes.js
+++ b/plugins/kolab_notes/notes.js
@@ -1006,6 +1006,7 @@ function rcube_kolab_notes_ui(settings)
         $('.tagline, .dates', rcmail.gui_objects.noteviewtitle).hide();
         $(rcmail.gui_objects.noteseditform).hide();
         $(rcmail.gui_objects.notesdetailview).hide();
+        $(rcmail.gui_objects.notesattachmentslist).html('');
         rcmail.enable_command('save', false);
     }