Merge remote-tracking branch 'remotes/origin/release/v7.5.0' into develop

This commit is contained in:
Sergey Linnik
2023-10-12 13:51:38 +03:00

View File

@ -534,7 +534,7 @@ DocManager.prototype.getHistory = function getHistory(fileName, content, keyVers
if (content && contentJson) {
userNameFromJson = oldVersion ? contentJson.username : contentJson.user.name;
userIdFromJson = oldVersion ? contentJson.userid : contentJson.user.userid;
userIdFromJson = oldVersion ? contentJson.userid : contentJson.user.id;
createdFromJson = oldVersion ? contentJson.date : contentJson.created;
}