summaryrefslogtreecommitdiffstats
path: root/lib/private/files/storage/dav.php
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-10-13 17:15:58 +0200
committerVincent Petry <pvince81@owncloud.com>2014-10-13 17:15:58 +0200
commitab5149f5df332a41f88973ecdc0a9b7ba24a5423 (patch)
treea5e71ae6dc76ba0c4d2ecccd49a2045499fa4eee /lib/private/files/storage/dav.php
parent4b9465b937a7754d2b58a77cf8f12adeaccef993 (diff)
downloadnextcloud-server-ab5149f5df332a41f88973ecdc0a9b7ba24a5423.tar.gz
nextcloud-server-ab5149f5df332a41f88973ecdc0a9b7ba24a5423.zip
Allow specifying protocol in ext storage OC config
Allow specifying a protocol in the host field when mounting another ownCloud instance. Note that this was already possible with the WebDAV config but this bug made it inconsistent.
Diffstat (limited to 'lib/private/files/storage/dav.php')
-rw-r--r--lib/private/files/storage/dav.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index a0ef79a7b32..7f53704e94f 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -58,7 +58,7 @@ class DAV extends \OC\Files\Storage\Common {
$this->root .= '/';
}
} else {
- throw new \Exception();
+ throw new \Exception('Invalid webdav storage configuration');
}
}
@@ -85,7 +85,7 @@ class DAV extends \OC\Files\Storage\Common {
return 'webdav::' . $this->user . '@' . $this->host . '/' . $this->root;
}
- protected function createBaseUri() {
+ public function createBaseUri() {
$baseUri = 'http';
if ($this->secure) {
$baseUri .= 's';