Merge branch 'develop' into feature/analizators

ONLYOFFICE · Feb 7, 2022 · 9f5a1f3 · 9f5a1f3
2 parents 37c88da + e16d758
commit 9f5a1f3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/common/ASC.Core.Common/Data/DbSettingsManager.cs b/common/ASC.Core.Common/Data/DbSettingsManager.cs
@@ -334,7 +334,12 @@ public void ClearCache<T>() where T : class, ISettings
 
         private T Deserialize<T>(string data)
         {
-            return JsonSerializer.Deserialize<T>(data);
+            var options = new JsonSerializerOptions
+            {
+                PropertyNameCaseInsensitive = true
+            };
+
+            return JsonSerializer.Deserialize<T>(data, options);
         }
 
         private string Serialize<T>(T settings)

diff --git a/web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs b/web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
@@ -78,16 +78,20 @@ public static Image GetImage(Image mainImg, Size size, UserPhotoThumbnailSetting
 
             var x = thumbnailSettings.Point.X > 0 ? thumbnailSettings.Point.X : 0;
             var y = thumbnailSettings.Point.Y > 0 ? thumbnailSettings.Point.Y : 0;
+            var width =  x + thumbnailSettings.Size.Width > mainImg.Width ? mainImg.Width : thumbnailSettings.Size.Width;
+            var height = y + thumbnailSettings.Size.Height > mainImg.Height ? mainImg.Height : thumbnailSettings.Size.Height;
+
             var rect = new Rectangle(x,
                                      y,
-                                     thumbnailSettings.Size.Width,
-                                     thumbnailSettings.Size.Height);
+                                     width,
+                                     height);
 
             Image destRound = mainImg.Clone(x => x.Crop(rect).Resize(new ResizeOptions
             {
                 Size = size,
                 Mode = ResizeMode.Stretch
-            }));
+            }));
+
             return destRound;
         }
     }