Fix javascript error after creating a folder which is a subfolder of another one (#1490297)

CHANGELOG

@@ -23,6 +23,7 @@ CHANGELOG Roundcube Webmail
 - Fix parsing invalid HTML messages with BOM after <!DOCTYPE> (#1490291)
 - Fix duplicate entry on timezones list in rcube_config::timezone_name_from_abbr() (#1490293)
 - Fix so localized folder name is displayed in multi-folder search result (#1490243)
+- Fix javascript error after creating a folder which is a subfolder of another one (#1490297)
 
 RELEASE 1.1.0
 -------------

program/js/app.js

@@ -1608,7 +1608,8 @@ function rcube_webmail()
 
   this.folder_collapsed = function(node)
   {
-    var prefname = this.env.task == 'addressbook' ? 'collapsed_abooks' : 'collapsed_folders';
+    var prefname = this.env.task == 'addressbook' ? 'collapsed_abooks' : 'collapsed_folders',
+      old = this.env[prefname];
 
     if (node.collapsed) {
       this.env[prefname] = this.env[prefname] + '&'+urlencode(node.id)+'&';
@@ -1624,6 +1625,7 @@ function rcube_webmail()
     }
 
     if (!this.drag_active) {
+      if (old !== this.env[prefname])
         this.command('save-pref', { name: prefname, value: this.env[prefname] });
 
       if (this.env.unread_counts)

program/steps/settings/folders.inc

@@ -265,7 +265,7 @@ function rcmail_subscription_form($attrib)
 
     $js_folders = array();
     $folders    = array();
-    $collapsed  = $RCMAIL->config->get('collapsed_folders');
+    $collapsed  = (string) $RCMAIL->config->get('collapsed_folders');
 
     // create list of available folders
     foreach ($list_folders as $i => $folder) {