summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-07-30 16:38:05 +0200
committerAndrey Andreev <narf@bofh.bg>2012-07-30 16:38:05 +0200
commitbdb99999195711903af712fab58fdf4ef3da72ad (patch)
treec30857efad8623ebf12dbfab1b098bb6f7f6a828
parent4df0be86a3ee120e307d6140a9106e77a4962bb0 (diff)
Some clean-up and style changes
-rw-r--r--system/core/Common.php18
-rw-r--r--system/libraries/Email.php2
-rw-r--r--user_guide_src/source/changelog.rst10
-rw-r--r--user_guide_src/source/libraries/email.rst2
4 files changed, 16 insertions, 16 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index 5cd3961d1..57374b07d 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -603,18 +603,18 @@ if ( ! function_exists('html_escape'))
if ( ! function_exists('_stringify_attributes'))
{
/**
- * Stringify attributes for use in html tags.
+ * Stringify attributes for use in HTML tags.
*
- * Helper function used to convert a string, array, or object of
- * attributes to a string
+ * Helper function used to convert a string, array, or object
+ * of attributes to a string.
*
- * @param mixed string, array, object
- * @param bool
- * @return string
+ * @param mixed string, array, object
+ * @param bool
+ * @return string
*/
function _stringify_attributes($attributes, $js = FALSE)
{
- $atts = null;
+ $atts = NULL;
if (empty($attributes))
{
@@ -632,10 +632,10 @@ if ( ! function_exists('_stringify_attributes'))
{
$atts .= ($js) ? $key.'='.$val.',' : ' '.$key.'="'.$val.'"';
}
-
+
return rtrim($atts, ',');
}
}
/* End of file Common.php */
-/* Location: ./system/core/Common.php */
+/* Location: ./system/core/Common.php */ \ No newline at end of file
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 196a4b36c..8fd7a79e7 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1269,7 +1269,7 @@ class CI_Email {
$this->_build_message();
$result = $this->_spool_email();
-
+
if ($result && $auto_clear)
{
$this->clear();
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 4d69c4dc3..03df6e3a8 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -146,8 +146,6 @@ Release Date: Not Released
- CI_Session now respects php.ini's session.gc_probability and session.gc_divisor
- Added max_filename_increment config setting for Upload library.
- CI_Loader::_ci_autoloader() is now a protected method.
- - 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).
- :doc:`Cart library <libraries/cart>` changes include:
- It now auto-increments quantity's instead of just resetting it, this is the default behaviour of large e-commerce sites.
- Product Name strictness can be disabled via the Cart Library by switching "$product_name_safe".
@@ -177,9 +175,11 @@ Release Date: Not Released
- Added a Wincache driver to the :doc:`Caching Library <libraries/caching>`.
- Added a Redis driver to the :doc:`Caching Library <libraries/caching>`.
- :doc:`Email library <libraries/email>` changes include:
- - Added dsn (delivery status notification) option.
- - Successfully sent emails will automatically clear the parameters.
- - Renamed method _set_header() to set_header() and made it public to enable adding custom headers in the :doc:`Email Library <libraries/email>`.
+ - 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 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 an "index" parameter to the data() method in the :doc:`Upload Library <libraries/file_uploading>`.
- :doc:`Pagination Library <libraries/pagination>` changes include:
- Added support for the anchor "rel" attribute.
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index f56bc2ff5..4403079b6 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -227,7 +227,7 @@ success or failure, enabling it to be used conditionally::
}
This function will automatically clear all parameters if the request was
- successful. To stop this behaviour pass FALSE::
+successful. To stop this behaviour pass FALSE::
if ($this->email->send(FALSE))
{