Changeset 11ea2ac in github


Ignore:
Timestamp:
Sep 8, 2009 4:04:17 AM (4 years ago)
Author:
alecpl <alec@…>
Branches:
master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8
Children:
e8d8b6f
Parents:
b48d9bf
Message:
  • Fix delete in message view deletes permanently with flag_for_deletion=true (#1486101)
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • CHANGELOG

    rb48d9bf r11ea2ac  
    22=========================== 
    33 
     4- Fix delete in message view deletes permanently with flag_for_deletion=true (#1486101) 
    45- Use faster/secure mt_rand() (#1486094) 
    56- Fix roundcube hangs on empty inbox with bincimapd (#1486093) 

  • program/steps/mail/show.inc

    re54bb72 r11ea2ac  
    7575  $OUTPUT->set_env('permaurl', rcmail_url('show', array('_uid' => $MESSAGE->uid, '_mbox' => $mbox_name))); 
    7676  $OUTPUT->set_env('mailbox', $mbox_name); 
     77 
    7778  if ($CONFIG['trash_mbox']) 
    7879    $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']); 
     80  if ($CONFIG['flag_for_deletion']) 
     81    $OUTPUT->set_env('flag_for_deletion', true); 
     82  if ($CONFIG['read_when_deleted']) 
     83    $OUTPUT->set_env('read_when_deleted', true); 
     84  if ($CONFIG['skip_deleted']) 
     85    $OUTPUT->set_env('skip_deleted', true); 
     86  if ($CONFIG['display_next']) 
     87    $OUTPUT->set_env('display_next', true); 
     88 
    7989  if (!$OUTPUT->ajax_call) 
    8090    $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage'); 
    … …  
    144154    } 
    145155 
    146   if ($CONFIG['display_next']) 
    147     $OUTPUT->set_env('display_next', true); 
    148  
    149156  if (!$MESSAGE->headers->seen) 
    150157    $RCMAIL->plugins->exec_hook('message_read', array('uid' => $MESSAGE->uid, 
Note: See TracChangeset for help on using the changeset viewer.