summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2017-09-06 23:02:45 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2017-09-26 23:10:23 +0200
commit9db3b04f1bdf38623732fb65c618485eea1f654a (patch)
treebdc1803e5c2c8e28af09af78a843b7cd1275c84c /lib/private
parentc55583d1b43d1cc72e831a8ff113bd8c60b1a6d3 (diff)
downloadnextcloud-server-9db3b04f1bdf38623732fb65c618485eea1f654a.tar.gz
nextcloud-server-9db3b04f1bdf38623732fb65c618485eea1f654a.zip
finetune the appinfo parser
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/App/InfoParser.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php
index 2b1eb759964..0531682d67a 100644
--- a/lib/private/App/InfoParser.php
+++ b/lib/private/App/InfoParser.php
@@ -165,7 +165,10 @@ 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'])) {
+ 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'];
}