summaryrefslogtreecommitdiffstats
path: root/apps/files_external
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-06-28 09:02:03 +0200
committerGitHub <noreply@github.com>2016-06-28 09:02:03 +0200
commitb6397ef73a765be807efe363703f27013fd50d7a (patch)
tree31fedc1887b2b3b50e720f1e006f9693cd671cff /apps/files_external
parent300f0965ae6528b370662ee39346bf6660aeaa5c (diff)
parent6670d3765881a1a7579bd96a523a90c2a52aec4a (diff)
downloadnextcloud-server-b6397ef73a765be807efe363703f27013fd50d7a.tar.gz
nextcloud-server-b6397ef73a765be807efe363703f27013fd50d7a.zip
Merge pull request #236 from nextcloud/master-sync-upstream
[Master] sync upstream
Diffstat (limited to 'apps/files_external')
-rw-r--r--apps/files_external/lib/AppInfo/Application.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files_external/lib/AppInfo/Application.php b/apps/files_external/lib/AppInfo/Application.php
index cbbcbe9c319..0ee4e9b3d5c 100644
--- a/apps/files_external/lib/AppInfo/Application.php
+++ b/apps/files_external/lib/AppInfo/Application.php
@@ -52,6 +52,10 @@ class Application extends App implements IBackendProvider, IAuthMechanismProvide
$backendService->registerBackendProvider($this);
$backendService->registerAuthMechanismProvider($this);
+ // force-load auth mechanisms since some will register hooks
+ // TODO: obsolete these and use the TokenProvider to get the user's password from the session
+ $this->getAuthMechanisms();
+
// app developers: do NOT depend on this! it will disappear with oC 9.0!
\OC::$server->getEventDispatcher()->dispatch(
'OCA\\Files_External::loadAdditionalBackends'