From 505b3d6b42d608b8555b62b78134f697a1f6d09f Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 8 Feb 2014 18:24:00 +0200 Subject: Make CI_Email::set_alt_message() parameter mandatory (optional doesn't make sense) --- system/libraries/Email.php | 2 +- user_guide_src/source/changelog.rst | 2 +- user_guide_src/source/libraries/email.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index f4efff882..88925e03f 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -822,7 +822,7 @@ class CI_Email { * @param string * @return CI_Email */ - public function set_alt_message($str = '') + public function set_alt_message($str) { $this->alt_message = (string) $str; return $this; diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 0344b7894..a6fabe16b 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -331,7 +331,7 @@ Release Date: Not Released - Added option to store raw values instead of CI-formatted ones (APC, Memcache). - Added atomic increment/decrement feature via ``increment()``, ``decrement()``. - - :doc:`Email Library ` changes include: + - :doc:`E-mail Library ` changes include: - 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)``. diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst index 3f990b628..ebfde809b 100644 --- a/user_guide_src/source/libraries/email.rst +++ b/user_guide_src/source/libraries/email.rst @@ -238,7 +238,7 @@ Class Reference $this->email->message('This is my message'); - .. method:: set_alt_message([$str = '']) + .. method:: set_alt_message($str) :param string $str: Alternative e-mail message body :returns: CI_Email instance (method chaining) -- cgit v1.2.3-24-g4f1b