From d94b3acd335085f7dd2d1ad6bad9d6c2a276f906 Mon Sep 17 00:00:00 2001 From: KrzysztofPajak Date: Fri, 4 Sep 2020 08:54:26 +0200 Subject: [PATCH] Allow using the logo in png format for plugins --- Grand.Core/Plugins/PluginExtensions.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Grand.Core/Plugins/PluginExtensions.cs b/Grand.Core/Plugins/PluginExtensions.cs index c7cfe0da3f..804c60fca6 100644 --- a/Grand.Core/Plugins/PluginExtensions.cs +++ b/Grand.Core/Plugins/PluginExtensions.cs @@ -19,14 +19,18 @@ public static string GetLogoUrl(this PluginDescriptor pluginDescriptor, IWebHelp } var pluginDirectory = pluginDescriptor.OriginalAssemblyFile.Directory; - var logoLocalPath = Path.Combine(pluginDirectory.FullName, "logo.jpg"); - if (!File.Exists(logoLocalPath)) + var logoPluginJpg = Path.Combine(pluginDirectory.FullName, "logo.jpg"); + if (File.Exists(logoPluginJpg)) { - return null; + return string.Format("{0}{1}/{2}/logo.jpg", webHelper.GetStoreLocation(), pluginDirectory.Parent.Name, pluginDirectory.Name); + } + var logoPluginPng = Path.Combine(pluginDirectory.FullName, "logo.png"); + if (File.Exists(logoPluginPng)) + { + return string.Format("{0}{1}/{2}/logo.png", webHelper.GetStoreLocation(), pluginDirectory.Parent.Name, pluginDirectory.Name); } + return null; - string logoUrl = string.Format("{0}{1}/{2}/logo.jpg", webHelper.GetStoreLocation(), pluginDirectory.Parent.Name, pluginDirectory.Name); - return logoUrl; } } }