summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-01-10 13:45:31 +0100
committerAndrey Andreev <narf@devilix.net>2014-01-10 13:45:31 +0100
commitc809726558cc5364713e49c7404e43989203c4af (patch)
tree66abb98994bb93c902d9054e3043d147979ced3b /user_guide_src
parent2b21ee8dcf040d7c749e0010c46492d221d25552 (diff)
Further changes related to PR #2807
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/changelog.rst10
-rw-r--r--user_guide_src/source/libraries/email.rst14
2 files changed, 12 insertions, 12 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 34eff5d57..b112da5b4 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -332,11 +332,11 @@ Release Date: Not Released
- :doc:`Email Library <libraries/email>` changes include:
- - Added custom filename to ``Email::attach()`` as ``$this->email->attach($filename, $disposition, $newname)``.
- - Added possibility to send attachment as buffer string in ``Email::attach()`` as ``$this->email->attach($buffer, $disposition, $newname, $mime)``.
- - Added method ``Email::attach_cid()`` returning CID which enables to embed an attachment to html.
+ - Added a custom filename parameter to ``attach()`` as ``$this->email->attach($filename, $disposition, $newname)``.
+ - Added possibility to send attachment as buffer string in ``attach()`` as ``$this->email->attach($buffer, $disposition, $newname, $mime)``.
+ - Added method ``attachment_cid()`` to enable embedding inline attachments into HTML.
- 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>`.
+ - Renamed method ``_set_header()`` to ``set_header()`` and made it public to enable adding custom headers.
- Successfully sent emails will automatically clear the parameters.
- Added a *return_path* parameter to the ``from()`` method.
- Removed the second parameter (character limit) from internal method ``_prep_quoted_printable()`` as it is never used.
@@ -345,7 +345,7 @@ Release Date: Not Released
- Removed unused protected method ``_get_ip()`` (:doc:`Input Library <libraries/input>`'s ``ip_address()`` should be used anyway).
- Internal method ``_prep_q_encoding()`` now utilizes PHP's *mbstring* and *iconv* extensions (when available) and no longer has a second (``$from``) argument.
- Added an optional parameter to ``print_debugger()`` to allow specifying which parts of the message should be printed ('headers', 'subject', 'body').
- - Added SMTP keepalive option to avoid opening the connection for each ``Email::send()``. Accessible as ``$smtp_keepalive``.
+ - Added SMTP keepalive option to avoid opening the connection for each ``send()`` call. Accessible as ``$smtp_keepalive``.
- Public method ``set_header()`` now filters the input by removing all "\\r" and "\\n" characters.
- :doc:`Pagination Library <libraries/pagination>` changes include:
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index 274d88d46..8e3800306 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -269,13 +269,13 @@ parameter as mime-type::
$this->email->attach($buffer, 'attachment', 'report.pdf', 'application/pdf');
-$this->email->attach_cid()
- --------------------------
+$this->email->attachment_cid()
+------------------------------
- Returns CID which enables to embed an attachment to html. First parameter
- must be attached file.
+Sets and returns an attachment's Content-ID, which enables your to embed an inline
+(picture) attachment into HTML. First parameter must be attached file.
- ::
+::
$filename = '/img/photo1.jpg';
$this->email->attach($filename);
@@ -286,8 +286,8 @@ $this->email->attach_cid()
$this->email->message('<img src='cid:". $cid ."' alt="photo1" />');
$this->email->send();
}
-
- CID for each Email have to be create again to be unique.
+
+CID for each Email have to be create again to be unique.
$this->email->print_debugger()
------------------------------