From 5972624464165b6f47d3e1861f9887435621a28f Mon Sep 17 00:00:00 2001 From: nathan Date: Thu, 19 Dec 2024 14:11:29 -0700 Subject: [PATCH] Mail: Merge into email was only accepted for classes named _merge, now accepting EGroupware\\Merge also --- mail/inc/class.mail_compose.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php index 4d77346c83..a05c26d072 100644 --- a/mail/inc/class.mail_compose.inc.php +++ b/mail/inc/class.mail_compose.inc.php @@ -1623,7 +1623,7 @@ class mail_compose * Use ajax_merge to merge & send multiple */ // Merge selected ID (in mailtocontactbyid or $mail_id) into given document - $merge_class = preg_match('/^([a-z_-]+_merge)$/', $_REQUEST['merge']) ? $_REQUEST['merge'] : 'EGroupware\\Api\\Contacts\\Merge'; + $merge_class = preg_match('/^(EGroupware\\\\.+\\\\Merge|[a-z_-]+_merge)$/', $_REQUEST['merge']) ? $_REQUEST['merge'] : 'EGroupware\\Api\\Contacts\\Merge'; $document_merge = new $merge_class(); $this->mail_bo->openConnection(); $merge_ids = $_REQUEST['preset']['mailtocontactbyid'] ? $_REQUEST['preset']['mailtocontactbyid'] : $mail_id;