aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-02-18 10:17:34 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-02-18 10:17:34 +0100
commitcaa6d3e2db27390a4fc591f563ab05bad7cc3c70 (patch)
tree3b0ff0fd82dc54d03da3dfd5dae1e341ba494745
parent2b1f39cd6be9ca0ea2a32693ec5f49cb15ad68d1 (diff)
parentc640e2fa66c1ead7461d28d9bda3b8959b5986eb (diff)
downloadnextcloud-server-caa6d3e2db27390a4fc591f563ab05bad7cc3c70.tar.gz
nextcloud-server-caa6d3e2db27390a4fc591f563ab05bad7cc3c70.zip
Merge pull request #13857 from owncloud/phpseclib-0.3.9
Update phpseclib to version 0.3.9.
-rw-r--r--apps/files_external/lib/sftp.php12
1 files changed, 2 insertions, 10 deletions
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index 2a762ad068f..c021f778feb 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -25,16 +25,8 @@ class SFTP extends \OC\Files\Storage\Common {
private static $tempFiles = array();
public function __construct($params) {
- // The sftp:// scheme has to be manually registered via inclusion of
- // the 'Net/SFTP/Stream.php' file which registers the Net_SFTP_Stream
- // stream wrapper as a side effect.
- // A slightly better way to register the stream wrapper is available
- // since phpseclib 0.3.7 in the form of a static call to
- // Net_SFTP_Stream::register() which will trigger autoloading if
- // necessary.
- // TODO: Call Net_SFTP_Stream::register() instead when phpseclib is
- // updated to 0.3.7 or higher.
- require_once 'Net/SFTP/Stream.php';
+ // Register sftp://
+ \Net_SFTP_Stream::register();
$this->host = $params['host'];
$proto = strpos($this->host, '://');