extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-06 22:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mail: Merge into email was only accepted for classes named <appname>_merge, now accepting EGroupware\<appname>\Merge also

Browse Source
This commit is contained in:
nathan 2024-12-19 14:11:29 -07:00
parent 10314e59bc
commit b0b9feab91
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/inc/class.mail_compose.inc.php
View File

@ -1644,7 +1644,7 @@ class mail_compose
* Use ajax_merge to merge & send multiple * Use ajax_merge to merge & send multiple
*/ */
// Merge selected ID (in mailtocontactbyid or $mail_id) into given document // 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(); $document_merge = new $merge_class();
$this->mail_bo->openConnection(); $this->mail_bo->openConnection();
$merge_ids = $_REQUEST['preset']['mailtocontactbyid'] ? $_REQUEST['preset']['mailtocontactbyid'] : $mail_id; $merge_ids = $_REQUEST['preset']['mailtocontactbyid'] ? $_REQUEST['preset']['mailtocontactbyid'] : $mail_id;