[Svn] r1937 - trunk/roundcubemail/program/steps/mail

trac at roundcube.net trac at roundcube.net
Sun Oct 5 05:05:17 CEST 2008


Author: estadtherr
Date: 2008-10-04 22:05:16 -0500 (Sat, 04 Oct 2008)
New Revision: 1937

Modified:
   trunk/roundcubemail/program/steps/mail/func.inc
Log:
restore some script environment variables removed in r1918 but needed in "show" action

Modified: trunk/roundcubemail/program/steps/mail/func.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/func.inc	2008-10-04 20:07:53 UTC (rev 1936)
+++ trunk/roundcubemail/program/steps/mail/func.inc	2008-10-05 03:05:16 UTC (rev 1937)
@@ -73,6 +73,15 @@
 
   $OUTPUT->set_pagetitle(rcmail_localize_foldername($IMAP->get_mailbox_name()));
   }
+else if ($RCMAIL->action == 'show')
+  {
+  // set current mailbox in client environment
+  $OUTPUT->set_env('mailbox', $IMAP->get_mailbox_name());
+  if ($CONFIG['trash_mbox'])
+    $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);
+  if (!$OUTPUT->ajax_call)
+    rcube_add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage');
+  }
 
 
 /**
@@ -183,7 +192,7 @@
     $out .= '<td class="'.$col.$sort_class.'" id="rcmHead'.$col.'">' . "$col_name$sort</td>\n";    
     }
 
-  $out .= '<td class="icon">'.($attrib['attachmenticon'] ? sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '') : '')."</td>\n";
+  $out .= '<td class="icon">'.($attrib['attachmenticon'] ? sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '') : ' ')."</td>\n";
   $out .= "</tr></thead>\n<tbody>\n";
 
   // no messages in this mailbox

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list