From f6941f00e4e7dcc98aa6ff303aab9ea254a12bd2 Mon Sep 17 00:00:00 2001 From: pallo Date: Mon, 18 Dec 2000 13:44:38 +0000 Subject: [PATCH] The configured IMAP folder delimiter ($optional_delimiter) was never used (it was always detected). Fixed that. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@895 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/imap_general.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/functions/imap_general.php b/functions/imap_general.php index f6c8e79b..5df2e3e9 100755 --- a/functions/imap_general.php +++ b/functions/imap_general.php @@ -179,8 +179,14 @@ function sqimap_capability($imap_stream, $capability) { ** Returns the delimeter between mailboxes: INBOX/Test, or INBOX.Test... ******************************************************************************/ function sqimap_get_delimiter ($imap_stream = false) { - global $imap_general_debug; - global $sqimap_delimiter; + global $imap_general_debug; + global $sqimap_delimiter; + global $optional_delimiter; + + /* Use configured delimiter if set */ + if((!empty($optional_delimiter)) && $optional_delimiter != "detect") { + return $optional_delimiter; + } /* Do some caching here */ if (!$sqimap_delimiter) { -- 2.25.1