mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-03-03 19:11:22 +01:00
fix: regression from refactor of uploadedpicture refactor
This commit is contained in:
@@ -259,11 +259,10 @@ module.exports = function (User) {
|
|||||||
if (user.hasOwnProperty('groupTitle')) {
|
if (user.hasOwnProperty('groupTitle')) {
|
||||||
parseGroupTitle(user);
|
parseGroupTitle(user);
|
||||||
}
|
}
|
||||||
|
const isUsingUploadedPicture = user.picture && user.picture === user.uploadedpicture;
|
||||||
if (user.uploadedpicture || user.picture) {
|
if (isUsingUploadedPicture || user.uploadedpicture) {
|
||||||
const source = (user.picture && user.picture === user.uploadedpicture) ? user.picture : user.uploadedpicture;
|
user.uploadedpicture = prependRelativePath(user.uploadedpicture);
|
||||||
if (source) {
|
if (isUsingUploadedPicture) {
|
||||||
user.uploadedpicture = prependRelativePath(source);
|
|
||||||
user.picture = user.uploadedpicture;
|
user.picture = user.uploadedpicture;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user