Added the ability to set CRLF settings via config in the Email class.
Added SVN commit number to changelog
Fixed more guide typos and examples
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 1896787..19121c5 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -491,6 +491,26 @@
// --------------------------------------------------------------------
/**
+ * Set CRLF
+ *
+ * @access public
+ * @param string
+ * @return void
+ */
+ function set_crlf($crlf = "\n")
+ {
+ if ($crlf != "\n" AND $crlf != "\r\n" AND $crlf != "\r")
+ {
+ $this->crlf = "\n";
+ return;
+ }
+
+ $this->crlf = $crlf;
+ }
+
+ // --------------------------------------------------------------------
+
+ /**
* Set Message Boundary
*
* @access private
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 0718097..59ab295 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -58,7 +58,8 @@
<h1>Change Log</h1>
<h2>Version 1.6.2</h2>
-<p>Release Date: not currently released</p>
+<p>Release Date: not currently released<br />
+SVN Commit: not currently released</p>
<ul>
<li>Active Record
<ul>
@@ -71,25 +72,25 @@
<ul>
<li>Added 'application/vnd.ms-powerpoint' to list of mime types.</li>
<li>Added 'audio/mpg' to list of mime types.</li>
- <li>Added new user-modifiable file constants.php containing file mode constants</li>
+ <li>Added new user-modifiable file constants.php containing file mode constants.</li>
+ <li>Added the ability to set CRLF settings via config in the <a href="libraries/email.html">Email</a> class.</li>
</ul>
</li>
<li>Libraries
<ul>
<li>Added increased security for filename handling in the Upload library.</li>
<li>Added increased security for sessions for client-side data tampering.</li>
- <li>Added <kbd>form_button()</kbd> in the <a href="helpers/form_helper.html">Form helper</a>.</li>
- <li>The MySQLi forge class is now in sync with MySQL forge. </li>
+ <li>The MySQLi forge class is now in sync with MySQL forge. </li>
+ <li>Added the ability to set CRLF settings via config in the <a href="libraries/email.html">Email</a> class.</li>
</ul>
</li>
<li>Helpers
<ul>
+ <li>Added <kbd>form_button()</kbd> in the <a href="helpers/form_helper.html">Form helper</a>.</li>
<li>Modified <kbd>img()</kbd> in the <a href="helpers/html_helper.html">HTML Helper</a> to remove an unneeded space (#4208).</li>
<li>Modified <kbd>anchor()</kbd> in the <a href="helpers/url_helper.html">URL helper</a> to convert entities in the title attribute (#4209).</li>
- <li>Fixed a bug in <kbd>link_tag()</kbd> of the <a href="helpers/url_helper.html">URL helper</a> where a key was passed instead of a value.</li>
- <li>Fixed a bug in DB_result::row() that prevented it from returning individual fields with MySQL NULL values.</li>
<li>The <a href="helpers/download_helper.html">Download helper</a> now exits within <kbd>force_download()</kbd>.</li>
- </ul>
+ </ul>
</li>
<li>Plugins
<ul>
@@ -100,17 +101,20 @@
<h3>Bugfixes for 1.6.2</h3>
<ul>
- <li>Fixed assorted user guide typos (#3453, #4364).</li>
+ <li>Fixed assorted user guide typos (#3453, #4364, #4379, #4399, #4408, #4412, #4448).</li>
<li>Fixed an AR_caching error where it wasn't tracking table aliases (#3463).</li>
<li>Fixed an AR bug when joining with a table alias and table prefix (#4400).</li>
<li>Fixed a bug in the DB class testing the $params argument.</li>
<li>Fixed a bug in the Table library where the integer 0 in cell data would be displayed as a blank cell.</li>
<li>Fixed bugs (#3523, #4350) in get_filenames() with recursion and problems with Windows when $include_path is used.</li>
<li>Fixed a bug (#4413) where a URI containing slashes only e.g. 'http://example.com/index.php?//' would result in PHP errors</li>
-</ul>
+ <li>Fixed a bug in <kbd>link_tag()</kbd> of the <a href="helpers/url_helper.html">URL helper</a> where a key was passed instead of a value.</li>
+ <li>Fixed a bug in DB_result::row() that prevented it from returning individual fields with MySQL NULL values.</li>
+ </ul>
<h2>Version 1.6.1</h2>
-<p>Release Date: February 12, 2008</p>
+<p>Release Date: February 12, 2008<br />
+ SVN Commit: 6732</p>
<ul>
<li>Active Record
<ul>
diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html
index ccc8332..7ad6b43 100644
--- a/user_guide/general/credits.html
+++ b/user_guide/general/credits.html
@@ -57,11 +57,11 @@
<h1>Credits</h1>
-<p>CodeIgniter was developed by <a href="http://www.ellislab.com">Rick Ellis</a>, who in his other life is CEO of
+<p>CodeIgniter was developed by <a href="http://www.ellislab.com/">Rick Ellis</a>, who in his other life is CEO of
<a href="http://ellislab.com/">Ellislab, Inc.</a> The core framework was written
specifically for this application, while many of the class libraries, helpers, and sub-systems borrow from the code-base of
-<a href="http://www.EllisLab.com/ee/">ExpressionEngine</a>, a Content Management System written by Rick Ellis and
-<a href="http://www.reedmaniac.com">Paul Burdick</a>.</p>
+<a href="http://www.expressionengine.com/">ExpressionEngine</a>, a Content Management System written by Rick Ellis and
+<a href="http://www.reedmaniac.com/">Paul Burdick</a>.</p>
<p>A hat tip goes to Ruby on Rails for inspiring us to create a PHP framework, and for
bringing frameworks into the general consciousness of the web community.</p>
diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html
index b01453a..a936142 100644
--- a/user_guide/libraries/email.html
+++ b/user_guide/libraries/email.html
@@ -163,8 +163,16 @@
<td class="td"><strong>validate</strong></td><td class="td">FALSE</td><td class="td">TRUE or FALSE (boolean)</td><td class="td">Whether to validate the email address.</td>
</tr><tr>
<td class="td"><strong>priority</strong></td><td class="td">3</td><td class="td">1, 2, 3, 4, 5</td><td class="td">Email Priority. 1 = highest. 5 = lowest. 3 = normal.</td>
-</tr><tr>
-<td class="td"><strong>newline</strong></td><td class="td">\n</td><td class="td">"\r\n" or "\n"</td><td class="td">Newline character. (Use "\r\n" to comply with RFC 822).</td>
+</tr>
+<tr>
+ <td class="td"><strong>crlf</strong></td>
+ <td class="td">\n</td>
+ <td class="td">"\r\n" or "\n" or "\r"</td>
+ <td class="td">Newline character. (Use "\r\n" to comply with RFC 822).</td>
+</tr>
+<tr>
+<td class="td"><strong>newline</strong></td><td class="td">\n</td>
+<td class="td">"\r\n" or "\n" or "\r"</td><td class="td">Newline character. (Use "\r\n" to comply with RFC 822).</td>
</tr><tr>
<td class="td"><strong>bcc_batch_mode</strong></td><td class="td">FALSE</td><td class="td">TRUE or FALSE (boolean)</td><td class="td">Enable BCC Batch Mode.</td>
</tr><tr>