mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-25 16:19:00 +01:00
Indicate merge class to use for mail, fixes infolog placeholders not known
This commit is contained in:
parent
5544c63b34
commit
694a63d1f4
@ -1839,6 +1839,7 @@ abstract class bo_merge
|
||||
$extra = array(
|
||||
'from=merge',
|
||||
'document='.$file['path'],
|
||||
'merge='.get_called_class()
|
||||
);
|
||||
|
||||
// egw.open() used if only 1 row selected
|
||||
|
@ -1397,7 +1397,9 @@ class mail_compose
|
||||
* Use ajax_merge to merge & send multiple
|
||||
*/
|
||||
// Merge selected ID (in mailtocontactbyid or $mail_id) into given document
|
||||
$document_merge = new addressbook_merge();
|
||||
preg_match('/^([a-z_-]+_merge)$/', $_REQUEST['merge'], $merge_class);
|
||||
$merge_class = $merge_class[1] ? $merge_class[1] : 'addressbook_merge';
|
||||
$document_merge = new $merge_class();
|
||||
$this->mail_bo->openConnection();
|
||||
$merge_ids = $_REQUEST['preset']['mailtocontactbyid'] ? $_REQUEST['preset']['mailtocontactbyid'] : $mail_id;
|
||||
$merge_ids = is_array($merge_ids) ? $merge_ids : explode(',',$merge_ids);
|
||||
|
Loading…
Reference in New Issue
Block a user