Skip to content

Commit

Permalink
review fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
pierre-lehnen-rc committed Sep 23, 2021
1 parent aa458c3 commit 1742707
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 1 addition & 2 deletions app/lib/server/functions/setUserAvatar.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const setUserAvatar = function(user, dataURI, contentType, service, etag
let image;

if (service === 'initials') {
return Users.setAvatarData(user._id, service, null, null);
return Users.setAvatarData(user._id, service, null);
} if (service === 'url') {
let result = null;

Expand Down Expand Up @@ -53,7 +53,6 @@ export const setUserAvatar = function(user, dataURI, contentType, service, etag
}

const buffer = Buffer.from(image, encoding);

const fileStore = FileUpload.getStore('Avatars');
fileStore.deleteByName(user.username);

Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -2510,6 +2510,8 @@
"LDAP_Search_Size_Limit_Description": "The maximum number of entries to return.<br/>**Attention** This number should greater than **Search Page Size**",
"LDAP_Sync_Custom_Fields": "Sync Custom Fields",
"LDAP_CustomFieldMap": "Custom Fields Mapping",
"LDAP_Sync_AutoLogout_Enabled": "Enable Auto Logout",
"LDAP_Sync_AutoLogout_Interval": "Auto Logout Interval",
"LDAP_Sync_Now": "Sync Now",
"LDAP_Sync_Now_Description": "This will start a **Background Sync** operation now, without waiting for the next scheduled Sync.\nThis action is asynchronous, please see the logs for more information.",
"LDAP_Sync_User_Active_State": "Sync User Active State",
Expand Down

0 comments on commit 1742707

Please sign in to comment.