summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-11-28 13:58:07 +0100
committerGitHub <noreply@github.com>2016-11-28 13:58:07 +0100
commit518e2edba4541ba520386e20323c260e4dce5f0c (patch)
tree124ea205a1e06db5bc3ff956329415aa795c42bf
parentd02296d42f0d1ce95a9fca5491bd4f9e537dc67e (diff)
parent97b2782c5b6970a0d4115b6c48817ece7c60b1c3 (diff)
downloadnextcloud-server-518e2edba4541ba520386e20323c260e4dce5f0c.tar.gz
nextcloud-server-518e2edba4541ba520386e20323c260e4dce5f0c.zip
Merge pull request #2341 from nextcloud/filepicker-public-share
use public share fileclient when available
-rw-r--r--core/js/oc-dialogs.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 3b5c1ae7199..f811322b099 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -168,7 +168,7 @@ var OCdialogs = {
return;
}
this.filepicker.loading = true;
- this.filepicker.filesClient = OC.Files.getClient();
+ this.filepicker.filesClient = (OCA.Sharing && OCA.Sharing.PublicApp && OCA.Sharing.PublicApp.fileList)? OCA.Sharing.PublicApp.fileList.filesClient: OC.Files.getClient();
$.when(this._getFilePickerTemplate()).then(function($tmpl) {
self.filepicker.loading = false;
var dialogName = 'oc-dialog-filepicker-content';