merge sandbox to trunk for 1.4.3.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7659 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2010-08-25 06:19:21 +00:00
parent 289973781a
commit 200d63636c
195 changed files with 8166 additions and 3576 deletions

View file

@ -23,10 +23,16 @@
var $header = '';
var $eol = '';
var $references = '';
var $additional_params = null;
function Mail() { }
function setAdditionalParams($additional_params)
{
$this->additional_params = $additional_params;
}
function addAttachment($filename, $orgfilename)
{
$this->attachments[$orgfilename] = $filename;
@ -221,7 +227,7 @@
$this->references?("References: <".$this->references.">".$this->eol."In-Reply-To: <".$this->references.">".$this->eol):""
);
$headers .= $this->header;
if($this->additional_params) return mail($this->getReceiptor(), $this->getTitle(), $this->body, $headers, $this->additional_params);
return mail($this->getReceiptor(), $this->getTitle(), $this->body, $headers);
}