fix conflicts with develop branch (#13532)

6 years ago · 1e82c371a3
parent 409bc3c405
commit 1e82c371a3
1 changed files with 1 additions and 1 deletions
--- 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({