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

Fix translation and appIcon issue in mail integration

Browse Source
This commit is contained in:
Hadi Nategh 2015-06-03 13:24:51 +00:00
parent f64e44ffad
commit a7043964bb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mail/inc/class.mail_integration.inc.php
View File

@ -76,15 +76,14 @@ class mail_integration {
$time = time(); $time = time();
$_date = egw_time::server2user($time->now,'ts'); $_date = egw_time::server2user($time->now,'ts');
} }
$GLOBALS['egw_info']['flags']['currentapp'] = $app;
// Integrate not yet saved mail // Integrate not yet saved mail
if (empty($_GET['rowid']) && $_to_emailAddress && $app) if (empty($_GET['rowid']) && $_to_emailAddress && $app)
{ {
$sessionLocation = 'mail'; $sessionLocation = 'mail';
$mailbox = base64_decode($_GET['mailbox']); $mailbox = base64_decode($_GET['mailbox']);
$GLOBALS['egw_info']['flags']['currentapp'] = $app;
if (!($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions']==='text_only')&&is_array($_attachments)) if (!($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions']==='text_only')&&is_array($_attachments))
{ {
// initialize mail open connection requirements // initialize mail open connection requirements
@ -283,7 +282,11 @@ class mail_integration {
// Get the registered hook method of requested app for integration // Get the registered hook method of requested app for integration
$hook = $GLOBALS['egw']->hooks->single(array('location' => 'mail_import'),$app); $hook = $GLOBALS['egw']->hooks->single(array('location' => 'mail_import'),$app);
// Load translation for the app since the original URL
// is from mail integration and only loads mail translation
translation::add_app($app);
// Execute import mail with provided content // Execute import mail with provided content
ExecMethod($hook['menuaction'],array ( ExecMethod($hook['menuaction'],array (
'addresses' => $data_addresses, 'addresses' => $data_addresses,