From 193a10bc39a8c644066fffa1fe497c3f49030fe9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Apr 2020 02:29:10 +0200
Subject: [PATCH] FIX cloning of emailing when no content selected

---
 htdocs/comm/mailing/card.php                | 4 ++--
 htdocs/comm/mailing/class/mailing.class.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index a21ea9d7d0a..e4e4237db05 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -90,13 +90,13 @@ if (empty($reshook))
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes')
 	{
-		if (empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"]))
+		if (! GETPOST("clone_content", 'alpha') && ! GETPOST("clone_receivers", 'alpha'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		}
 		else
 		{
-			$result = $object->createFromClone($user, $object->id, $_REQUEST["clone_content"], $_REQUEST["clone_receivers"]);
+			$result = $object->createFromClone($user, $object->id, GETPOST("clone_content", 'alpha'), GETPOST("clone_receivers", 'alpha'));
 			if ($result > 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 553c5e79c15..a671db7b7f9 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -273,8 +273,8 @@ class Mailing extends CommonObject
 	 *
 	 *  @param	User	$user		    User making the clone
 	 *	@param  int		$fromid     	Id of object to clone
-	 *	@param	int		$option1		1=Copy content, 0=Forget content
-	 *	@param	int		$option2		Not used
+	 *	@param	int		$option1		1=Clone content, 0=Forget content
+	 *	@param	int		$option2		1=Clone recipients
 	 *	@return	int						New id of clone
 	 */
 	public function createFromClone(User $user, $fromid, $option1, $option2)
@@ -305,7 +305,7 @@ class Mailing extends CommonObject
 			$object->bgcolor            = '';
 			$object->bgimage            = '';
 
-			$object->email_from         = '';
+			//$object->email_from         = '';		// We do not reset from email because it is a mandatory value
 			$object->email_replyto      = '';
 			$object->email_errorsto     = '';
 
@@ -331,7 +331,7 @@ class Mailing extends CommonObject
 
 		if (! $error)
 		{
-			//Clone target
+			// Clone recipient targets
 			if (!empty($option2)) {
 				require_once DOL_DOCUMENT_ROOT .'/core/modules/mailings/modules_mailings.php';