Bläddra i källkod

The configured IMAP folder delimiter ($optional_delimiter) was never used (it
was always detected). Fixed that.

pallo 24 år sedan
förälder
incheckning
9d692148ef
1 ändrade filer med 8 tillägg och 2 borttagningar
  1. 8 2
      functions/imap_general.php

+ 8 - 2
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) {