X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fsent_subfolders%2Fsetup.php;h=882b9d784222de67b7732d08370478348006da76;hb=0b97a708e71c931153cd1ceee1495c9f4e1e209b;hp=a2565c66aae591f8bbff3371602b8ca7ec64e931;hpb=72b9aff9407cd1cd1a6083231a3933f9cf5e04a1;p=squirrelmail.git

diff --git a/plugins/sent_subfolders/setup.php b/plugins/sent_subfolders/setup.php
index a2565c66..882b9d78 100644
--- a/plugins/sent_subfolders/setup.php
+++ b/plugins/sent_subfolders/setup.php
@@ -47,8 +47,8 @@ function squirrelmail_plugin_init_sent_subfolders() {
 }
 
 function sent_subfolders_check_handleAsSent() {
-    global $handleAsSent_result, $sent_subfolders_base;
-    global $use_sent_subfolders;
+    global $handleAsSent_result, $sent_subfolders_base,
+           $use_sent_subfolders, $delimiter;
     $sent_subfolders_base = 'INBOX.Sent';
     $args = func_get_arg(0);
 
@@ -68,8 +68,8 @@ function sent_subfolders_check_handleAsSent() {
 }
 
 function sent_subfolders_load_prefs() {
-    global $use_sent_subfolders;
-    global $sent_subfolders_setting, $sent_subfolders_base;
+    global $use_sent_subfolders, $data_dir, $username,
+           $sent_subfolders_setting, $sent_subfolders_base;
 
     $use_sent_subfolders = getPref
     ($data_dir, $username, 'use_sent_subfolders', SMPREF_OFF);
@@ -160,12 +160,14 @@ function sent_subfolders_update_sentfolder() {
             Multiple year holders with messages in it. level 1.
             Multiple year folders with holders in it. level 2.
         */
-
+/*
         if( $imap_server_type == 'uw' ) {
             $cnd_delimiter = '';
         } else {
             $cnd_delimiter = $delimiter;
         }
+*/        
+        $cnd_delimiter = $delimiter;
                                         
         switch ($sent_subfolders_setting) {
         case SMPREF_SENT_SUBFOLDERS_YEARLY: