Version 3.4.5

upload/ips_kernel/classFtp.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * FTP Class
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $ BY $Author: bfarber $
+ * Last Updated: $Date: 2013-02-06 10:51:28 -0500 (Wed, 06 Feb 2013) $ BY $Author: mark $
  * </pre>
  *
  * @author 		Mark Wade
@@ -12,7 +12,7 @@
  * @license		http://www.invisionpower.com/company/standards.php#license
  * @package		IP.Board
  * @link		http://www.invisionpower.com
- * @version		$Rev: 10914 $
+ * @version		$Rev: 11945 $
  *
  */
 
@@ -68,7 +68,7 @@ class classFtp
 		}
 
 		/* Connect */
-		if ( !( $this->stream = ftp_connect( $host, $port, $timeout ) ) )
+		if ( !( $this->stream = @ftp_connect( $host, $port, $timeout ) ) )
 		{
 			throw new Exception( 'CONNECT_FAIL' );
 		}
@@ -123,7 +123,13 @@ class classFtp
 	{
 		if ( $dir == '..' )
 		{
+			$currentDir = @ftp_pwd( $this->stream );
 			$chdir = @ftp_cdup( $this->stream );
+			
+			if ( $currentDir === @ftp_pwd( $this->stream ) )
+			{
+				$chdir = false;
+			}
 		}
 		elseif ( substr( $dir, 0, 1 ) !== '/' )
 		{
@@ -139,7 +145,7 @@ class classFtp
 		{
 			throw new Exception( 'CHDIR_FAILED' );
 		}
-		$this->directory = $dir;
+		$this->directory = @ftp_pwd( $this->stream );
 	}
 	
 	/**