diff options
author | blizzz <blizzz@arthur-schiwon.de> | 2017-10-04 15:43:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-04 15:43:44 +0200 |
commit | 2d62f97f1bf1e7848e23ff0417915c3ab9e03e9a (patch) | |
tree | f1a67d6f764999fa802aa7034711321af684ddb9 /lib/private/App | |
parent | 5412c239f2ca128760c8d12de3bcd01384ddfd3f (diff) | |
parent | a579f8aa375bf02f9763892ce725713f08526a1a (diff) | |
download | nextcloud-server-2d62f97f1bf1e7848e23ff0417915c3ab9e03e9a.tar.gz nextcloud-server-2d62f97f1bf1e7848e23ff0417915c3ab9e03e9a.zip |
Merge pull request #6328 from nextcloud/split-sharees-api-logic
Splits off the logic from sharees endpoint thus making it available from within Nc/via PHP.
Diffstat (limited to 'lib/private/App')
-rw-r--r-- | lib/private/App/InfoParser.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php index fef8ab7a1e8..0531682d67a 100644 --- a/lib/private/App/InfoParser.php +++ b/lib/private/App/InfoParser.php @@ -165,6 +165,12 @@ class InfoParser { if (isset($array['activity']['providers']['provider']) && is_array($array['activity']['providers']['provider'])) { $array['activity']['providers'] = $array['activity']['providers']['provider']; } + if (isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']) + && is_array($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']) + && !isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']['class']) + ) { + $array['collaboration']['collaborators']['searchPlugins'] = $array['collaboration']['collaborators']['searchPlugins']['searchPlugin']; + } if(!is_null($this->cache)) { $this->cache->set($fileCacheKey, json_encode($array)); |