diff options
| author | Michael Granados <michaelgranados@gmail.com> | 2014-11-12 00:49:26 +0100 |
|---|---|---|
| committer | Michael Granados <michaelgranados@gmail.com> | 2014-11-12 00:49:26 +0100 |
| commit | 92e2fd2320a27519922e2927cf810d8c846e7b4e (patch) | |
| tree | 518c8d96f1a8e9888c48ce3d6304cade6f05bea2 | |
| parent | 0b85d6b3bb0236a6567ebc8f42b643d5486070ef (diff) | |
Making required changes
Signed-off-by: Michael Granados <michaelgranados@gmail.com>
| -rw-r--r-- | system/language/english/email_lang.php | 4 | ||||
| -rw-r--r-- | system/libraries/Email.php | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php index d63e700fe..b7b09f2c2 100644 --- a/system/language/english/email_lang.php +++ b/system/language/english/email_lang.php @@ -41,7 +41,7 @@ $lang['email_must_be_array'] = 'The email validation method must be passed an ar $lang['email_invalid_address'] = 'Invalid email address: %s'; $lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s'; $lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s'; -$lang['email_no_sender'] = 'You must include sender (From)'; +$lang['email_no_from'] = 'Cannot send mail with no "From" header.'; $lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc'; $lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.'; $lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.'; @@ -58,4 +58,4 @@ $lang['email_smtp_data_failure'] = 'Unable to send data: %s'; $lang['email_exit_status'] = 'Exit status code: %s'; /* End of file email_lang.php */ -/* Location: ./system/language/english/email_lang.php */
\ No newline at end of file +/* Location: ./system/language/english/email_lang.php */ diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 34ce5b156..454482ef4 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1630,9 +1630,9 @@ class CI_Email { */ public function send($auto_clear = TRUE) { - if ( ! isset($this->_headers['From']) ) + if ( ! isset($this->_headers['From'])) { - $this->_set_error_message('lang:email_no_sender'); + $this->_set_error_message('lang:email_no_from'); return FALSE; } @@ -2273,4 +2273,4 @@ class CI_Email { } /* End of file Email.php */ -/* Location: ./system/libraries/Email.php */
\ No newline at end of file +/* Location: ./system/libraries/Email.php */ |