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 eb37601694e4d70dbcdb724ff387c896a6db2fe7..6d60a6a8271a96a7fc34045289901382da99b39e 100644 (file)
--- 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 0224ce67fbe0f4171d02ef889f6bac6adfa849fc..13f45062cd79f49120651d22c13c17cee56e5a37 100755 (executable)
--- 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')) {