From 84fd1d18aa19f1e176e20dbf106f5e28c1d929bd Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 24 Sep 2019 10:41:53 +0000 Subject: [PATCH] Fix error when contacts folder contains non-alphanum chars (Bifrost#T245789) By removing outdated and redundant check. --- plugins/kolab_addressbook/kolab_addressbook.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/plugins/kolab_addressbook/kolab_addressbook.php b/plugins/kolab_addressbook/kolab_addressbook.php index 263d4eb3..aeb88d44 100644 --- a/plugins/kolab_addressbook/kolab_addressbook.php +++ b/plugins/kolab_addressbook/kolab_addressbook.php @@ -406,13 +406,7 @@ class kolab_addressbook extends rcube_plugin public function get_address_book($p) { if ($p['id']) { - $id = kolab_storage::id_decode($p['id']); - - // check for falsely base64 decoded identifier - if (preg_match('![^A-Za-z0-9=/+&._ -]!', $id)) { - $id = $p['id']; - } - + $id = kolab_storage::id_decode($p['id']); $folder = kolab_storage::get_folder($id); // try with unencoded (old-style) identifier