From bd0551b22076b82a6d49e9f7a2b2e0c90a1b2326 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Fri, 05 Feb 2016 07:25:27 -0500 Subject: [PATCH] Secure also downloads of addressbook exports, managesieve script exports and Enigma keys exports --- program/lib/Roundcube/rcube_storage.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/program/lib/Roundcube/rcube_storage.php b/program/lib/Roundcube/rcube_storage.php index c427f48..387b3d0 100644 --- a/program/lib/Roundcube/rcube_storage.php +++ b/program/lib/Roundcube/rcube_storage.php @@ -454,7 +454,7 @@ { $headers = $this->get_message_headers($uid); return rcube_charset::convert($this->get_message_part($uid, $part, null), - $headers->charset ? $headers->charset : $this->default_charset); + $headers->charset ?: $this->default_charset); } /** @@ -945,10 +945,11 @@ * @param string $folder Folder name (empty for server metadata) * @param array $entries Entries * @param array $options Command options (with MAXSIZE and DEPTH keys) + * @param bool $force Disables cache use * * @return array Metadata entry-value hash array on success, NULL on error */ - abstract function get_metadata($folder, $entries, $options = array()); + abstract function get_metadata($folder, $entries, $options = array(), $force = false); /* ----------------------------------------- * Cache related functions -- Gitblit v1.9.1