holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow merge_print for emails on all applications (only one entry at a time, exept addressbook); addressbook merge_print with an email of one contact, the mail is stored with the draft folder and then opens the compose dialog, if used on multiple contacts, we try to send them right away. Better control of SigOnTop Handling.

Browse Source
This commit is contained in:
Klaus Leithoff 2011-06-30 15:28:29 +00:00
parent 3f6fcf60d2
commit b30fcc52f3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etemplate/inc/class.bo_merge.inc.php
View File

@ -118,8 +118,7 @@ abstract class bo_merge
case 'application/xml':
return true; // alias for text/xml, eg. ms office 2003 word format
case 'message/rfc822':
if ($GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook') return true; // ToDo: check if you are theoretical able to send mail
else break;
return true; // ToDo: check if you are theoretical able to send mail
default:
if (substr($mimetype,0,5) == 'text/')
{