fix conflicts with develop branch (#13532)

RocketChat · Apr 6, 2019 · 1e82c37 · 1e82c37
1 parent 409bc3c
commit 1e82c37
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js
@@ -403,7 +403,7 @@ API.v1.addRoute('users.getPreferences', { authRequired: true }, {
 	get() {
 		const user = Users.findOneById(this.userId);
 		if (user.settings) {
-			const { preferences } = user.settings;
+			const { preferences = {} } = user.settings;
 			preferences.language = user.language;
 
 			return API.v1.success({