From ec5e9b31efd073727bca894362dec9f21e2e768e Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 28 Oct 2019 13:27:47 +0100 Subject: [PATCH] Fix object_prettyname() result for other user folders if the id cannot be resolved to username (Bifrost#T253094) --- plugins/libkolab/lib/kolab_storage.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/libkolab/lib/kolab_storage.php b/plugins/libkolab/lib/kolab_storage.php index 2e2a51b0..192a510c 100644 --- a/plugins/libkolab/lib/kolab_storage.php +++ b/plugins/libkolab/lib/kolab_storage.php @@ -659,8 +659,10 @@ class kolab_storage // get username part and map it to user name $pos = strpos($folder, $delim); $fid = $pos ? substr($folder, 0, $pos) : $folder; - $fid = self::folder_id2user($fid, true); - $fid = str_replace($delim, '', $fid); + + if ($user = self::folder_id2user($fid, true)) { + $fid = str_replace($delim, '', $user); + } $prefix = "($fid)"; $folder = $pos ? substr($folder, $pos + 1) : '';