From 3ca060a00e5039aa00d4180ded52b1af49939114 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 27 Nov 2013 16:30:31 +0200
Subject: [ci skip] Remove a few more spaces

---
 system/libraries/Ftp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Ftp.php')

diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php
index dc6bbd226..2489f490f 100644
--- a/system/libraries/Ftp.php
+++ b/system/libraries/Ftp.php
@@ -392,7 +392,7 @@ class CI_FTP {
 		{
 			if ($this->debug === TRUE)
 			{
-				$this->_error('ftp_unable_to_' . ($move === FALSE ? 'rename' : 'move'));
+				$this->_error('ftp_unable_to_'.($move === FALSE ? 'rename' : 'move'));
 			}
 			return FALSE;
 		}
-- 
cgit v1.2.3-24-g4f1b


From 430b14cccd8e05de5b6b1268239e492ddea8f308 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 3 Jan 2014 17:31:26 +0200
Subject: Make CI_FTP::mkdir()'s first parameter mandatory (optional doesn't
 make sense)

---
 system/libraries/Ftp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Ftp.php')

diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php
index 2489f490f..84ecf133c 100644
--- a/system/libraries/Ftp.php
+++ b/system/libraries/Ftp.php
@@ -247,7 +247,7 @@ class CI_FTP {
 	 * @param	int	$permissions
 	 * @return	bool
 	 */
-	public function mkdir($path = '', $permissions = NULL)
+	public function mkdir($path, $permissions = NULL)
 	{
 		if ($path === '' OR ! $this->_is_conn())
 		{
-- 
cgit v1.2.3-24-g4f1b


From b4c62180ea70fba546aa8fe1813685dd72e4a406 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 3 Jan 2014 17:39:26 +0200
Subject: FTP class improvements

 - Make changedir()'s first parameter mandatory (optional doesn't make sense)
 - Fix a few typos (langfile included)
---
 system/libraries/Ftp.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'system/libraries/Ftp.php')

diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php
index 84ecf133c..4be2d0a21 100644
--- a/system/libraries/Ftp.php
+++ b/system/libraries/Ftp.php
@@ -214,10 +214,10 @@ class CI_FTP {
 	 * Internally, this parameter is only used by the "mirror" function below.
 	 *
 	 * @param	string	$path
-	 * @param	bool	$supress_debug
+	 * @param	bool	$suppress_debug
 	 * @return	bool
 	 */
-	public function changedir($path = '', $supress_debug = FALSE)
+	public function changedir($path, $suppress_debug = FALSE)
 	{
 		if ($path === '' OR ! $this->_is_conn())
 		{
@@ -228,7 +228,7 @@ class CI_FTP {
 
 		if ($result === FALSE)
 		{
-			if ($this->debug === TRUE && $supress_debug === FALSE)
+			if ($this->debug === TRUE && $suppress_debug === FALSE)
 			{
 				$this->_error('ftp_unable_to_changedir');
 			}
@@ -260,7 +260,7 @@ class CI_FTP {
 		{
 			if ($this->debug === TRUE)
 			{
-				$this->_error('ftp_unable_to_makdir');
+				$this->_error('ftp_unable_to_mkdir');
 			}
 			return FALSE;
 		}
-- 
cgit v1.2.3-24-g4f1b


From 45549a2919892e31782fc4381d7db8c6f3293bcb Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 6 Jan 2014 13:55:38 +0200
Subject: Remove a redudant value check

---
 system/libraries/Ftp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Ftp.php')

diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php
index 4be2d0a21..73a68441a 100644
--- a/system/libraries/Ftp.php
+++ b/system/libraries/Ftp.php
@@ -219,7 +219,7 @@ class CI_FTP {
 	 */
 	public function changedir($path, $suppress_debug = FALSE)
 	{
-		if ($path === '' OR ! $this->_is_conn())
+		if ( ! $this->_is_conn())
 		{
 			return FALSE;
 		}
-- 
cgit v1.2.3-24-g4f1b


From 871754af60251993d640981e107d2def5f2db396 Mon Sep 17 00:00:00 2001
From: darwinel <kmorssink@gmail.com>
Date: Tue, 11 Feb 2014 17:34:57 +0100
Subject: 2013 > 2014

Update copyright notices from 2013 to 2014.
And update one calendar example in user_guide from year 2013/2014 to
2014/2015.
---
 system/libraries/Ftp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Ftp.php')

diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php
index 73a68441a..ef3b7d70d 100644
--- a/system/libraries/Ftp.php
+++ b/system/libraries/Ftp.php
@@ -18,7 +18,7 @@
  *
  * @package		CodeIgniter
  * @author		EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
  * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  * @link		http://codeigniter.com
  * @since		Version 1.0
-- 
cgit v1.2.3-24-g4f1b