From: jangliss <jangliss@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 15 Jan 2006 18:54:35 +0000 (+0000)
Subject: Saved additional calls to NAMESPACE if it was already saved in the session
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=7eb6261ec33a66cbc61972115687290a5c13c149

Saved additional calls to NAMESPACE if it was already saved in the session
by redirect.php.  Suggestion from Michael Long.


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10546 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/ChangeLog b/ChangeLog
index eb376016..6d60a6a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -636,6 +636,8 @@ Version 1.5.0 - 2 February 2004
   - Integration of delete_move_next plugin into core.
   - Compression of buttons/headers for message index and message body
   - New option to save replies in the same folder as the original message.
+  - Remove possible unneeded IMAP call for NAMESPACE if it was saved in the
+    session (suggestion by Michael Long).
 
 
 **************************************
diff --git a/functions/imap_general.php b/functions/imap_general.php
index 0224ce67..13f45062 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -902,6 +902,11 @@ function sqimap_get_delimiter ($imap_stream = false) {
         return $optional_delimiter;
     }
 
+    /* Delimiter is stored in the session from redirect.  Try fetching from there first */
+    if (empty($sqimap_delimiter) {
+        sqgetGlobalVar('delimiter',$sqimap_delimiter,SQ_SESSION);
+    }
+
     /* Do some caching here */
     if (!$sqimap_delimiter) {
         if (sqimap_capability($imap_stream, 'NAMESPACE')) {