diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-04-15 16:21:41 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-04-15 16:25:47 +0200 |
| commit | a6c5d65fd621178c8d3899d5a43295edcc4840a2 (patch) | |
| tree | 24fa13735e2890f737537ebb4f82c22ddaf4026a /apps/files_external/lib | |
| parent | 1a2475227b6777e016ec931ddae533437bfbb2dd (diff) | |
| download | nextcloud-server-a6c5d65fd621178c8d3899d5a43295edcc4840a2.tar.gz nextcloud-server-a6c5d65fd621178c8d3899d5a43295edcc4840a2.zip | |
Fix SFTP storage id to be compatible with older ids
Remove port from SFTP storage id if it is 22.
This will prevent recreating a different storage entry due to id
mismatch after upgrade.
Diffstat (limited to 'apps/files_external/lib')
| -rw-r--r-- | apps/files_external/lib/sftp.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php index 392479c2f79..c457a87a6c7 100644 --- a/apps/files_external/lib/sftp.php +++ b/apps/files_external/lib/sftp.php @@ -133,7 +133,15 @@ class SFTP extends \OC\Files\Storage\Common { * {@inheritdoc} */ public function getId(){ - return 'sftp::' . $this->user . '@' . $this->host . ':' . $this->port . '/' . $this->root; + $id = 'sftp::' . $this->user . '@' . $this->host; + if ($this->port !== 22) { + $id .= ':' . $this->port; + } + // note: this will double the root slash, + // we should not change it to keep compatible with + // old storage ids + $id .= '/' . $this->root; + return $id; } /** |