From 308dea92b31be946ff54512841bb680217b56d50 Mon Sep 17 00:00:00 2001
From: josemariagomezroncero <josemariagomezroncero@gmail.com>
Date: Mon, 10 Aug 2020 20:40:11 +0200
Subject: [PATCH 1/3] Bug, this option disable topic input.

Bug, MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES disable topic input. We need the subject for email for save.
---
 htdocs/admin/mails_templates.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 0f490bb828a..3ac0a5df674 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -540,7 +540,7 @@ print "</tr>";
 
 // Show fields for topic, join files and body
 $fieldsforcontent = array('topic', 'joinfiles', 'content');
-if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $fieldsforcontent = array('content', 'content_lines'); }
+if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $fieldsforcontent = array('topic', 'content', 'content_lines'); }
 foreach ($fieldsforcontent as $tmpfieldlist)
 {
 	print '<tr class="impair nodrag nodrop nohover"><td colspan="6" class="nobottom">';

From 134bd11f47843f2b184546c0cb061e3ef0c2ba21 Mon Sep 17 00:00:00 2001
From: josemariagomezroncero <josemariagomezroncero@gmail.com>
Date: Fri, 14 Aug 2020 21:19:51 +0200
Subject: [PATCH 2/3] Update mails_templates.php

---
 htdocs/admin/mails_templates.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 3ac0a5df674..02746653aba 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -540,7 +540,7 @@ print "</tr>";
 
 // Show fields for topic, join files and body
 $fieldsforcontent = array('topic', 'joinfiles', 'content');
-if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $fieldsforcontent = array('topic', 'content', 'content_lines'); }
+if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $fieldsforcontent = array('topic', 'content', 'content_lines', 'joinfiles' ); }
 foreach ($fieldsforcontent as $tmpfieldlist)
 {
 	print '<tr class="impair nodrag nodrop nohover"><td colspan="6" class="nobottom">';

From 4edf19026411377a0d1e42168fe693ed2e6a4067 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Aug 2020 14:38:02 +0200
Subject: [PATCH 3/3] Update mails_templates.php

---
 htdocs/admin/mails_templates.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 02746653aba..9e2f443b5a6 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -540,7 +540,7 @@ print "</tr>";
 
 // Show fields for topic, join files and body
 $fieldsforcontent = array('topic', 'joinfiles', 'content');
-if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $fieldsforcontent = array('topic', 'content', 'content_lines', 'joinfiles' ); }
+if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines'); }
 foreach ($fieldsforcontent as $tmpfieldlist)
 {
 	print '<tr class="impair nodrag nodrop nohover"><td colspan="6" class="nobottom">';