From eda2a5637f50d215fef9748b0c27748bfda90c1e Mon Sep 17 00:00:00 2001
From: Shaun Walker <sbwalker@users.noreply.github.com>
Date: Wed, 24 Feb 2021 17:26:54 -0500
Subject: [PATCH] Revert "Fix Upload SVG throw error #1120"

---
 Oqtane.Client/Modules/Admin/Files/Index.razor |  2 +-
 Oqtane.Server/Controllers/FileController.cs   | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor
index 58990804..26cd56f9 100644
--- a/Oqtane.Client/Modules/Admin/Files/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Index.razor
@@ -42,7 +42,7 @@
             <td><a href="@(ContentUrl(context.FileId))" target="_new">@context.Name</a></td>
             <td>@context.ModifiedOn</td>
             <td>@context.Extension.ToUpper() @Localizer["File"]</td>
-            <td>@string.Format("{0:0.00}", ((decimal)context.Size / 1000)) KB</td>
+            <td>@(context.Size / 1000) KB</td>
         </Row>
     </Pager>
     @if (_files.Count == 0)
diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs
index b65d4c9e..ce36dae2 100644
--- a/Oqtane.Server/Controllers/FileController.cs
+++ b/Oqtane.Server/Controllers/FileController.cs
@@ -535,19 +535,16 @@ namespace Oqtane.Controllers
             file.ImageHeight = 0;
             file.ImageWidth = 0;
 
-            //svg has no image and height, the attributes for svg are held in the XML viewport
-            if(file.Extension != "svg")
-            { 
-                if (Constants.ImageFiles.Split(',').Contains(file.Extension.ToLower()))
+            if (Constants.ImageFiles.Split(',').Contains(file.Extension.ToLower()))
+            {
+                FileStream stream = new FileStream(filepath, FileMode.Open, FileAccess.Read);
+                using (var image = Image.FromStream(stream))
                 {
-                    FileStream stream = new FileStream(filepath, FileMode.Open, FileAccess.Read);
-                    using (var image = Image.FromStream(stream))
-                    {
-                        file.ImageHeight = image.Height;
-                        file.ImageWidth = image.Width;
-                    }
-                    stream.Close();
+                    file.ImageHeight = image.Height;
+                    file.ImageWidth = image.Width;
                 }
+
+                stream.Close();
             }
 
             return file;