projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bad assumptions about parallel arrays - see it explode by removing folders withou...
[squirrelmail.git]
/
src
/
empty_trash.php
diff --git
a/src/empty_trash.php
b/src/empty_trash.php
index eeeb537393af6d0b8add9ef46df78f2acbf17cfe..4c1099b284e829a9df80eb923143263b9fbecd6a 100644
(file)
--- a/
src/empty_trash.php
+++ b/
src/empty_trash.php
@@
-6,7
+6,7
@@
* Handles deleting messages from the trash folder without
* deleting subfolders.
*
* Handles deleting messages from the trash folder without
* deleting subfolders.
*
- * @copyright 1999-201
4
The SquirrelMail Project Team
+ * @copyright 1999-201
6
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@
-34,7
+34,8
@@
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
sqgetGlobalVar('smtoken', $submitted_token, SQ_GET, '');
sm_validate_security_token($submitted_token, -1, TRUE);
sqgetGlobalVar('smtoken', $submitted_token, SQ_GET, '');
sm_validate_security_token($submitted_token, -1, TRUE);
-$imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
+global $imap_stream_options; // in case not defined in config
+$imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0, $imap_stream_options);
$mailbox = $trash_folder;
$boxes = sqimap_mailbox_list($imap_stream);
$mailbox = $trash_folder;
$boxes = sqimap_mailbox_list($imap_stream);