summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-05 16:08:20 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-05 16:08:20 +0200
commit66bf2c7dc4921681708630305eb2b1c2cd7d7670 (patch)
treebeadfc2c3bec632c3e77de29847a12920f2994cd /user_guide_src
parent1194ad733135214e9905123258df3600b01735fd (diff)
parentcc7c7c691ad16beb5040a8a1d07064e61b5e2167 (diff)
Merge pull request #1586 from melounek/email_return_path
added parameter for returned-path in Email::from()
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/changelog.rst1
-rw-r--r--user_guide_src/source/libraries/email.rst7
2 files changed, 8 insertions, 0 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5cfd795b1..5b123b929 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -196,6 +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().
- :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 4403079b6..fc324ffc9 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -117,6 +117,13 @@ Sets the email address and name of the person sending the email::
$this->email->from('you@example.com', 'Your Name');
+::
+
+ $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').
+
$this->email->reply_to()
-------------------------