extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-16 21:13:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backport commit r48051, committed by Nathan Gray. Indicate merge class to use for mail, fixes infolog placeholders not known

Browse Source
This commit is contained in:
Hadi Nategh 2014-08-14 07:41:24 +00:00
parent 34c3e1bd9a
commit fd976ea1dc
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etemplate/inc/class.bo_merge.inc.php
View File

@ -1831,7 +1831,7 @@ abstract class bo_merge
private static function document_mail_action(Array &$action, $file) private static function document_mail_action(Array &$action, $file)
{ {
unset($action['postSubmit']); unset($action['postSubmit']);
// Lots takes a while, confirm // Lots takes a while, confirm
$action['confirm_multiple'] = lang('Do you want to send the message to all selected entries, WITHOUT further editing?'); $action['confirm_multiple'] = lang('Do you want to send the message to all selected entries, WITHOUT further editing?');
@ -1839,6 +1839,7 @@ abstract class bo_merge
$extra = array( $extra = array(
'from=merge', 'from=merge',
'document='.$file['path'], 'document='.$file['path'],
'merge='.get_called_class()
); );
// egw.open() used if only 1 row selected // egw.open() used if only 1 row selected

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

@ -1397,7 +1397,9 @@ 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
$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(); $this->mail_bo->openConnection();
$merge_ids = $_REQUEST['preset']['mailtocontactbyid'] ? $_REQUEST['preset']['mailtocontactbyid'] : $mail_id; $merge_ids = $_REQUEST['preset']['mailtocontactbyid'] ? $_REQUEST['preset']['mailtocontactbyid'] : $mail_id;
$merge_ids = is_array($merge_ids) ? $merge_ids : explode(',',$merge_ids); $merge_ids = is_array($merge_ids) ? $merge_ids : explode(',',$merge_ids);