Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

FIX Init of email topic when using a template

Browse Source
This commit is contained in:
Laurent Destailleur
2018-12-27 05:18:16 +01:00
parent 6a708666b2
commit eda3a5bc8c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/class/html.formmail.class.php
View File

@@ -684,7 +684,7 @@ class FormMail extends Form
$out.= "</td></tr>\n"; $out.= "</td></tr>\n";
} }
// withoptiononeemailperrecipient // With option one email per recipient
if (! empty($this->withoptiononeemailperrecipient)) if (! empty($this->withoptiononeemailperrecipient))
{ {
$out.= '<tr><td class="minwidth200">'; $out.= '<tr><td class="minwidth200">';
@@ -779,7 +779,7 @@ class FormMail extends Form
// Topic // Topic
if (! empty($this->withtopic)) { if (! empty($this->withtopic)) {
$out .= $this->getHtmlForTopic(); $out .= $this->getHtmlForTopic($arraydefaultmessage, $helpforsubstitution);
} }
// Attached files // Attached files
@@ -1096,11 +1096,14 @@ class FormMail extends Form
/** /**
* get Html For Topic of message * get Html For Topic of message
* *
* @return string html * @param array $arraydefaultmessage Array with message template content
* @param string $helpforsubstitution Help string for substitution
* @return string Text for topic
*/ */
public function getHtmlForTopic() public function getHtmlForTopic($arraydefaultmessage, $helpforsubstitution)
{ {
global $conf, $langs, $form; global $conf, $langs, $form;
$defaulttopic = GETPOST('subject','none'); $defaulttopic = GETPOST('subject','none');
if (! GETPOST('modelselected','alpha') || GETPOST('modelmailselected') != '-1') { if (! GETPOST('modelselected','alpha') || GETPOST('modelmailselected') != '-1') {
if ($arraydefaultmessage && $arraydefaultmessage->topic) { if ($arraydefaultmessage && $arraydefaultmessage->topic) {