finetune the appinfo parser

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
9 years ago · 9db3b04f1b
parent c55583d1b4
commit 9db3b04f1b
1 changed files with 4 additions and 1 deletions
--- 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'];
 		}