Bring back forcing of string type for folders list items (removed unintentionally by last commit)

pull/194/head
Aleksander Machniak 11 years ago
parent 693612d396
commit 081f3b7d52

@ -4168,21 +4168,23 @@ class rcube_imap extends rcube_storage
return $folders; return $folders;
} }
// force the type of folder name variable (#1485527)
$folders = array_map('strval', $folders);
$specials = array_unique(array_intersect($specials, $folders)); $specials = array_unique(array_intersect($specials, $folders));
$head = array(); $head = array();
// place default folders on the top // place default folders on top
foreach ($specials as $special) { foreach ($specials as $special) {
$prefix = $special . $delimiter; $prefix = $special . $delimiter;
foreach ($folders as $idx => $folder) { foreach ($folders as $idx => $folder) {
if ($folder === $special) { if ($folder === $special) {
$head[] = (string) $special; $head[] = $special;
unset($folders[$idx]); unset($folders[$idx]);
} }
// put subfolders of default folders on their place... // put subfolders of default folders on their place...
else if (strpos($folder, $prefix) === 0) { else if (strpos($folder, $prefix) === 0) {
$head[] = (string) $folder; $head[] = $folder;
unset($folders[$idx]); unset($folders[$idx]);
} }
} }

Loading…
Cancel
Save