From 081f3b7d52340125c6a68c5587ed496167332544 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 22 May 2014 14:38:28 -0400
Subject: [PATCH] Bring back forcing of string type for folders list items (removed unintentionally by last commit)
---
program/lib/Roundcube/rcube_imap.php | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index 41d1c37..2ff48c7 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -4168,21 +4168,23 @@
return $folders;
}
+ // force the type of folder name variable (#1485527)
+ $folders = array_map('strval', $folders);
$specials = array_unique(array_intersect($specials, $folders));
$head = array();
- // place default folders on the top
+ // place default folders on top
foreach ($specials as $special) {
$prefix = $special . $delimiter;
foreach ($folders as $idx => $folder) {
if ($folder === $special) {
- $head[] = (string) $special;
+ $head[] = $special;
unset($folders[$idx]);
}
// put subfolders of default folders on their place...
else if (strpos($folder, $prefix) === 0) {
- $head[] = (string) $folder;
+ $head[] = $folder;
unset($folders[$idx]);
}
}
--
Gitblit v1.9.1