diff options
| -rw-r--r-- | system/language/english/ftp_lang.php | 2 | ||||
| -rw-r--r-- | system/libraries/Ftp.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php index 0b7087a6c..da744fea7 100644 --- a/system/language/english/ftp_lang.php +++ b/system/language/english/ftp_lang.php @@ -8,7 +8,7 @@ $lang['ftp_unable_to_changedir'] = "Unable to change directories."; $lang['ftp_unable_to_chmod'] = "Unable to set file permissions. Please check your path. Note: This feature is only available in PHP 5 or higher.";
$lang['ftp_unable_to_upload'] = "Unable to upload the specified file. Please check your path.";
$lang['ftp_no_source_file'] = "Unable to locate the source file. Please check your path.";
-$lang['ftp_unable_to_remame'] = "Unable to rename the file.";
+$lang['ftp_unable_to_rename'] = "Unable to rename the file.";
$lang['ftp_unable_to_delete'] = "Unable to delete the file.";
$lang['ftp_unable_to_move'] = "Unable to move the file. Please make sure the destination directory exists.";
diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index 9fdee0122..ed934b548 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -302,7 +302,7 @@ class CI_FTP { {
if ($this->debug == TRUE)
{
- $msg = ($move = FALSE) ? 'ftp_unable_to_remame' : 'ftp_unable_to_move';
+ $msg = ($move == FALSE) ? 'ftp_unable_to_rename' : 'ftp_unable_to_move';
$this->_error($msg);
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 86c89fee0..86e7b7595 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -158,6 +158,7 @@ Change Log <ul>
<li>Removed an extraneous call to loading models (#3286).</li>
<li>Removed extraneous load of $CFG in _display_cache() of the Output class (#3285)</li>
+ <li>Fixed a bug (#3330) in the FTP class where a comparison wasn't getting made.</li>
<li>Fixed a bug (#3310) with sanitization of globals in the Input class that could unset CI's global variables.</li>
<li>Fixed a bug (#1890) in csv_from_result() where content that included the delimiter would break the file.</li>
<li>Fixed a bug (#3156) in Text Helper highlight_code() causing PHP tags to be handled incorrectly.</li>
@@ -200,7 +201,7 @@ Change Log <li>Fixed an example of <kbd>accept_charset()</kbd> in the <a href="./libraries/user_agent.html">User Agent Library</a>.</li>
<li>Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.</li>
<li>Fixed a typo in the <a href="./helpers/string_helper.html">String Helper</a> (uniquid changed to uniqid).</li>
- <li>Fixed typos in the email Language class (email_attachment_unredable, email_filed_smtp_login).</li>
+ <li>Fixed typos in the email Language class (email_attachment_unredable, email_filed_smtp_login), and FTP Class (ftp_unable_to_remame).</li>
<li>Added a stripslashes() into the Upload Library.</li>
<li>Fixed assorted user guide typos.</li>
</ul>
|