- Fix problem with numeric folder names (#1485527)

git-svn-id: https://svn.roundcube.net/trunk@2021 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 6 insertions, 4 deletions

diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index e18c14c2e..7a8b00c1c 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -2669,13 +2669,15 @@ class rcube_imap
     // finally we must rebuild the list to move 
     // subfolders of default folders to their place...
     // ...also do this for the rest of folders because
-    // asort() is not properly sorting case sensitive names	
+    // asort() is not properly sorting case sensitive names
+
+    // set the type of folder name variable (#1485527) 
     while (list($key, $folder) = each($folders)) {
-      $a_out[] = $folder;
+      $a_out[] = (string) $folder;
       unset($folders[$key]);
       foreach ($folders as $idx => $f) {
 	if (strpos($f, $folder.$delimiter) === 0) {
-    	  $a_out[] = $f;
+    	  $a_out[] = (string) $f;
 	  unset($folders[$idx]);
 	  }
         }
diff --git a/roundcubemail/program/include/rcube_shared.inc b/roundcubemail/program/include/rcube_shared.inc
index 26de5b45c..9f8bc4f04 100644
--- a/roundcubemail/program/include/rcube_shared.inc
+++ b/roundcubemail/program/include/rcube_shared.inc
@@ -179,7 +179,7 @@ function json_serialize($var)
       return $brackets{0} . implode(',', $pairs) . $brackets{1};
     }
   }
-  else if (is_numeric($var) && strval(intval($var)) === strval($var))
+  else if (!is_string($var) && strval(intval($var)) === strval($var))
     return $var;
   else if (is_bool($var))
     return $var ? '1' : '0';