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

Try a checkstyle fix

Browse Source
This commit is contained in:
Laurent Destailleur 2012-03-27 09:46:00 +02:00
parent 9f9c2ef5ca
commit 325d055fbb
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/admin/mails.php
View File

@ -162,8 +162,7 @@ if (! empty($_POST['removedfile']) || ! empty($_POST['removedfilehtml']))
/* /*
* Send mail * Send mail
*/ */
if (($action == 'send' || $action == 'sendhtml') if (($action == 'send' || $action == 'sendhtml') && ! $_POST['addfile'] && ! $_POST['addfilehtml'] && ! $_POST["removedfile"] && ! $_POST['cancel'])
&& ! $_POST['addfile'] && ! $_POST['addfilehtml'] && ! $_POST["removedfile"] && ! $_POST['cancel'])
{ {
$error=0; $error=0;
@ -212,18 +211,18 @@ if (($action == 'send' || $action == 'sendhtml')
require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
$mailfile = new CMailFile( $mailfile = new CMailFile(
$subject, $subject,
$sendto, $sendto,
$email_from, $email_from,
$body, $body,
$filepath, $filepath,
$mimetype, $mimetype,
$filename, $filename,
$sendtocc, $sendtocc,
$sendtoccc, $sendtoccc,
$deliveryreceipt, $deliveryreceipt,
$msgishtml, $msgishtml,
$errors_to $errors_to
); );
$result=$mailfile->sendfile(); $result=$mailfile->sendfile();