summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-05 16:12:55 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-05 16:12:55 +0200
commitccd01c75f5802e4e4b74bb53414a58d2aa0fd0d8 (patch)
treea4183e523181584a80c3df7546fe66199dc32ae8
parent66bf2c7dc4921681708630305eb2b1c2cd7d7670 (diff)
Polish changes from #1586
-rw-r--r--system/libraries/Email.php4
-rw-r--r--user_guide_src/source/changelog.rst2
-rw-r--r--user_guide_src/source/libraries/email.rst6
3 files changed, 6 insertions, 6 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 84ea1654b..4776df498 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -198,7 +198,7 @@ class CI_Email {
if ($this->validate)
{
$this->validate_email($this->_str_to_array($from));
- if($return_path)
+ if ($return_path)
{
$this->validate_email($this->_str_to_array($return_path));
}
@@ -221,7 +221,7 @@ class CI_Email {
$this->set_header('From', $name.' <'.$from.'>');
- if(!$return_path)
+ if( ! $return_path)
{
$return_path = $from;
}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5b123b929..ff7229243 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -196,7 +196,7 @@ Release Date: Not Released
- Added dsn (delivery status notification) option.
- Renamed method _set_header() to set_header() and made it public to enable adding custom headers in the :doc:`Email Library <libraries/email>`.
- Successfully sent emails will automatically clear the parameters.
- - Added third parameter $return_path in method Email::from().
+ - Added a *return_path* parameter to the ``from()`` method.
- :doc:`Pagination Library <libraries/pagination>` changes include:
- Added support for the anchor "rel" attribute.
- Added support for setting custom attributes.
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index fc324ffc9..e7ed9f74c 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -117,12 +117,12 @@ Sets the email address and name of the person sending the email::
$this->email->from('you@example.com', 'Your Name');
-::
+You can also set a Return-Path, to help redirect undelivered mail::
$this->email->from('you@example.com', 'Your Name', 'returned_emails@example.com');
-Third parameter is redirect for undelivered emails (may not be configured with
-protocol 'smtp').
+.. note:: Return-Path can't be used if you've configured
+ 'smtp' as your protocol.
$this->email->reply_to()
-------------------------