From 3d705be6e79af822ae81ff3cbbfbfcd9d1432ee4 Mon Sep 17 00:00:00 2001
From: leithoff <kl@stylite.de>
Date: Tue, 17 May 2016 12:51:45 +0200
Subject: [PATCH] avoid fatal error on merging prefs

---
 api/src/Preferences.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/Preferences.php b/api/src/Preferences.php
index c9ce6286b4..81585d556f 100644
--- a/api/src/Preferences.php
+++ b/api/src/Preferences.php
@@ -421,7 +421,7 @@ class Preferences
 				default:
 					foreach($values as $app => $vals)
 					{
-						$this->group[$app] = $vals + (array)$this->group[$app];
+						$this->group[$app] = (array)$vals + (array)$this->group[$app];
 					}
 					break;
 			}