From 7bb9fe23c002e9bb6d56e5d43af96292164ccf4a Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 16 Aug 2013 09:21:05 +0000 Subject: [PATCH] open eml files in mail or until mail has its own method for it in old felamimail --- filemanager/js/app.js | 2 +- mail/inc/class.mail_hooks.inc.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/filemanager/js/app.js b/filemanager/js/app.js index 4d1c6b0121..f154698602 100644 --- a/filemanager/js/app.js +++ b/filemanager/js/app.js @@ -451,7 +451,7 @@ app.filemanager = AppJS.extend( } else { - egw.open(path, 'file'); + egw.open({path: path, type: data.data.mime}, 'file'); } }, diff --git a/mail/inc/class.mail_hooks.inc.php b/mail/inc/class.mail_hooks.inc.php index 703170ccdb..dc5a86c707 100644 --- a/mail/inc/class.mail_hooks.inc.php +++ b/mail/inc/class.mail_hooks.inc.php @@ -95,7 +95,8 @@ class mail_hooks // register fmail as handler for .eml files 'mime' => array( 'message/rfc822' => array( -// 'menuaction' => 'mail.mail_ui.importMessageFromVFS2DraftAndDisplay', + 'menuaction' => 'felamimail.uifelamimail.importMessageFromVFS2DraftAndDisplay', + //'menuaction' => 'mail.mail_ui.importMessageFromVFS2DraftAndDisplay', 'mime_popup' => '850xegw_getWindowOuterHeight()', 'mime_url' => 'formData[file]', ),