lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix trackid

Browse Source
This commit is contained in:
Laurent Destailleur 2018-01-22 17:15:44 +01:00
parent 2ed34d813d
commit d1365c2492
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/actions_sendmails.inc.php
View File

@ -102,7 +102,8 @@ if (GETPOST('removAll','alpha'))
*/ */
if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_POST['removAll'] && ! $_POST['removedfile'] && ! $_POST['cancel'] && !$_POST['modelselected']) if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_POST['removAll'] && ! $_POST['removedfile'] && ! $_POST['cancel'] && !$_POST['modelselected'])
{ {
$trackid = GETPOST('trackid','aZ09'); if (empty($trackid)) $trackid = GETPOST('trackid','aZ09');
$subject='';$actionmsg='';$actionmsg2=''; $subject='';$actionmsg='';$actionmsg2='';
if (! empty($conf->dolimail->enabled)) $langs->load("dolimail@dolimail"); if (! empty($conf->dolimail->enabled)) $langs->load("dolimail@dolimail");

2
htdocs/user/card.php
View File

@ -1706,7 +1706,7 @@ else
$modelmail='user'; $modelmail='user';
$defaulttopic='Information'; $defaulttopic='Information';
$diroutput = $conf->user->dir_output; $diroutput = $conf->user->dir_output;
$trackid = 'user'.$object->id; $trackid = 'use'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';