Changeset 2021 in subversion

Timestamp:

Oct 29, 2008 8:39:12 AM (5 years ago)

Author:

alec

Message:

• Fix problem with numeric folder names (#1485527)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.php (modified) (1 diff)
• program/include/rcube_shared.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/10/29 (alec)
+----------
+- Fix problem with numeric folder names (#1485527)
 
 2008/10/27 (alec)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -2670 +2670 @@
     // 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]);
           }

trunk/roundcubemail/program/include/rcube_shared.inc

@@ -180 +180 @@
     }
   }
-  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))