Revert "FtpServer, SshServer: fixed getDir() for root / [Closes dg#44]"

This reverts commit 1ecd3d2.
george-oakling · Jan 13, 2015 · ac9538e · ac9538e
1 parent a0adcc4
commit ac9538e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Deployment/libs/FtpServer.php b/Deployment/libs/FtpServer.php
@@ -240,7 +240,7 @@ public function purge($path, callable $progress = NULL)
 	 */
 	public function getDir()
 	{
-		return '/' . trim($this->ftp('pwd'), '/');
+		return rtrim($this->ftp('pwd'), '/');
 	}
 
 

diff --git a/Deployment/libs/SshServer.php b/Deployment/libs/SshServer.php
@@ -188,7 +188,7 @@ public function purge($dir, callable $progress = NULL)
 	 */
 	public function getDir()
 	{
-		return '/' . trim(parse_url($this->url, PHP_URL_PATH), '/');
+		return rtrim(parse_url($this->url, PHP_URL_PATH), '/');
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -240,7 +240,7 @@ public function purge($path, callable $progress = NULL) @@
     	 */
     	public function getDir()
     	{
-    		return '/' . trim($this->ftp('pwd'), '/');
+    		return rtrim($this->ftp('pwd'), '/');
     	}
@@ Expand Down @@