- fix collapsing of folders with plus sign in name (use urlencode instead of escape)

1 files changed, 4 insertions, 4 deletions

diff --git a/program/js/app.js b/program/js/app.js
index f301e559c..81d8f86ca 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1210,7 +1210,7 @@ function rcube_webmail()
         ul.style.display = '';
         this.set_classname(div, 'collapsed', false);
         this.set_classname(div, 'expanded', true);
-        var reg = new RegExp('&'+escape(id)+'&');
+        var reg = new RegExp('&'+urlencode(id)+'&');
         this.set_env('collapsed_folders', this.env.collapsed_folders.replace(reg, ''));
         }
       else
@@ -1218,8 +1218,8 @@ function rcube_webmail()
         ul.style.display = 'none';
         this.set_classname(div, 'expanded', false);
         this.set_classname(div, 'collapsed', true);
-        this.set_env('collapsed_folders', this.env.collapsed_folders+'&'+escape(id)+'&');
-        
+        this.set_env('collapsed_folders', this.env.collapsed_folders+'&'+urlencode(id)+'&');
+
         // select parent folder if one of its childs is currently selected
         if (this.env.mailbox.indexOf(id + this.env.delimiter) == 0)
           this.command('list', id);
@@ -1236,7 +1236,7 @@ function rcube_webmail()
           li.nextSibling.getElementsByTagName("ul")[0].style.display = '';
         }
 
-      this.http_post('save-pref', '_name=collapsed_folders&_value='+escape(this.env.collapsed_folders));
+      this.http_post('save-pref', '_name=collapsed_folders&_value='+urlencode(this.env.collapsed_folders));
       this.set_unread_count_display(id, false);
       }
     }