Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate committed 2016-09-12 22:28:11 +00:00
commit 1f169d8fab
3 files changed
+17 -6

No files matched your search

@@ -0,0 +1 @@
<?php
+1
View File
@@ -0,0 +1 @@
<?php
+15 -6
View File
@@ -33,16 +33,25 @@ class Email_lib
*/
public function sendEmail($to, $subject, $message, $attachment = NULL)
{
$this->CI->email->from($this->CI->config->item('email'), $this->CI->config->item('company'));
$this->CI->email->to($to);
$this->CI->email->subject($subject);
$this->CI->email->message($message);
$email = $this->CI->email;
$email->from($this->CI->config->item('email'), $this->CI->config->item('company'));
$email->to($to);
$email->subject($subject);
$email->message($message);
if( !empty($attachment) )
{
$this->CI->email->attach($attachment);
$email->attach($attachment);
}
return $this->CI->email->send();
$result = $email->send();
if(!$result)
{
error_log($email->print_debugger());
}
return $result;
}
}