Skip to content

Instantly share code, notes, and snippets.

@TonyBunce
Created October 4, 2012 18:16
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save TonyBunce/3835398 to your computer and use it in GitHub Desktop.
Save TonyBunce/3835398 to your computer and use it in GitHub Desktop.
--- imp-5.0.23/lib/Mailbox.php 2012-07-20 20:10:34.000000000 -0400
+++ /var/www/html/horde/imp/lib/Mailbox.php 2012-10-04 14:12:32.751768553 -0400
@@ -625,7 +625,7 @@
return $injector->getInstance('IMP_Search')->isVinbox($this->_mbox);
case 'vtrash':
- return $injector->getInstance('IMP_Search')->isVtrash($this->_mbox);
+ return $injector->getInstance('IMP_Search')->isVTrash($this->_mbox);
}
return false;
@@ -1028,11 +1028,12 @@
/* If using Virtual Trash, only show deleted messages in
* the Virtual Trash mailbox. */
$delhide = $this->get($prefs->getValue('trash_folder'))->vtrash
- ? $this->vtrash
+ ? !$this->vtrash
: $prefs->getValue('delhide_trash') ? true : $deleted;
} else {
$delhide = $prefs->getValue('delhide');
}
+
/* Even if delhide is true, need to not hide if we are doing
* thread sort. */
diff -u -r imp-5.0.23/lib/Message.php /var/www/html/horde/imp/lib/Message.php
--- imp-5.0.23/lib/Message.php 2012-07-20 20:10:34.000000000 -0400
+++ /var/www/html/horde/imp/lib/Message.php 2012-10-04 14:11:36.719773831 -0400
@@ -245,7 +245,7 @@
$expunge_now = false;
$del_flags = array(Horde_Imap_Client::FLAG_DELETED);
- if ($use_vtrash ||
+ if (!$use_vtrash ||
!$imp_imap->access(IMP_Imap::ACCESS_TRASH) ||
!empty($opts['nuke']) ||
($use_trash && ($ob->mbox == $trash))) {
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment