Bugfix

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

diff --git a/plugins/sent_subfolders/setup.php b/plugins/sent_subfolders/setup.php
index 65e1c33d8ce57dd3349e7a4cd4e51c084d059e75..49ba12de37b80e267ebc4d3c38b182458ee77e77 100644 (file)
--- a/plugins/sent_subfolders/setup.php
+++ b/plugins/sent_subfolders/setup.php
@@ -147,7 +147,7 @@ function sent_subfolders_update_sentfolder() {
     global $sent_folder, $delimiter, $auto_create_special, $auto_create_done;
     global $sent_subfolders_base, $sent_subfolders_setting;
     global $username, $data_dir, $key, $imapServerAddress, $imapPort;
     global $sent_folder, $delimiter, $auto_create_special, $auto_create_done;
     global $sent_subfolders_base, $sent_subfolders_setting;
     global $username, $data_dir, $key, $imapServerAddress, $imapPort;

-    global $use_sent_subfolders, $move_to_sent;
+    global $use_sent_subfolders, $move_to_sent, $imap_server_type;

 
     if ($use_sent_subfolders || $move_to_sent) {
         $year = date('Y');
 
     if ($use_sent_subfolders || $move_to_sent) {
         $year = date('Y');


@@ -189,6 +189,11 @@ function sent_subfolders_update_sentfolder() {
             $year_folder = $sent_folder;
         }
 
             $year_folder = $sent_folder;
         }
 

+        if( $sent_subfolders_setting <> SMPREF_SENT_SUBFOLDERS_DISABLED && 
+            $imap_server_type <> 'uw' ) {
+            $year_folder .= $delimiter;            
+        }
+

         /* If this folder is NOT the current sent folder, update stuff. */
         if ($sent_subfolder != $sent_folder) {
             /* First, update the sent folder. */
         /* If this folder is NOT the current sent folder, update stuff. */
         if ($sent_subfolder != $sent_folder) {
             /* First, update the sent folder. */