[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] SF.net SVN: squirrelmail:[14092]
From:       pdontthink () users ! sourceforge ! net
Date:       2011-03-11 2:22:58
Message-ID: E1Pxs0I-0003dK-5V () sfp-svn-5 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 14092
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=14092&view=rev
Author:   pdontthink
Date:     2011-03-11 02:22:57 +0000 (Fri, 11 Mar 2011)

Log Message:
-----------
Undelete button shouldn't be related to whether or not a trash folder is in use - \
it's just a product of auto-expunge

Modified Paths:
--------------
    trunk/squirrelmail/functions/mailbox_display.php

Modified: trunk/squirrelmail/functions/mailbox_display.php
===================================================================
--- trunk/squirrelmail/functions/mailbox_display.php	2011-03-08 08:39:27 UTC (rev \
                14091)
+++ trunk/squirrelmail/functions/mailbox_display.php	2011-03-11 02:22:57 UTC (rev \
14092) @@ -1041,7 +1041,7 @@
                    $trash_folder) ? true : false; //
 
     $showUndelete = (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != \
                'READ-ONLY' &&
-                   in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true) && \
!$trash_folder) ? true : false; +                   \
in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true) /* trash folder unrelated \
methinks: && !$trash_folder*/) ? true : false;  $showMove   = ($aMailbox['RIGHTS'] != \
                'READ-ONLY') ? true : false;
     $showExpunge = (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY' \
                &&
                    in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true)) ? true : \
false;


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
                https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn


[prev in list] [next in list] [prev in thread] [next in thread]