update startup wizard

2 files changed, 8 insertions, 5 deletions

diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index cbf7f2602a..30dfe90882 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -198,10 +198,8 @@ namespace MediaBrowser.WebDashboard.Api
 
             var contentType = MimeTypes.GetMimeType(path);
 
-            var isHtml = IsHtml(path);
-
             // Bounce them to the startup wizard if it hasn't been completed yet
-            if (isHtml && !_serverConfigurationManager.Configuration.IsStartupWizardCompleted && path.IndexOf("wizard", StringComparison.OrdinalIgnoreCase) == -1)
+            if (!_serverConfigurationManager.Configuration.IsStartupWizardCompleted && path.IndexOf("wizard", StringComparison.OrdinalIgnoreCase) == -1 && GetPackageCreator().IsCoreHtml(path))
             {
                 // But don't redirect if an html import is being requested.
                 if (path.IndexOf("vulcanize", StringComparison.OrdinalIgnoreCase) == -1 && path.IndexOf("bower_components", StringComparison.OrdinalIgnoreCase) == -1)
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 463c8829c6..06ade9e84a 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -61,7 +61,7 @@ namespace MediaBrowser.WebDashboard.Api
                 // jQuery ajax doesn't seem to handle if-modified-since correctly
                 if (IsFormat(path, "html"))
                 {
-                    if (IsCoreHtml(path) && path.IndexOf(".template.html", StringComparison.OrdinalIgnoreCase) == -1)
+                    if (IsCoreHtml(path))
                     {
                         resourceStream = await ModifyHtml(resourceStream, mode, appVersion, localizationCulture, enableMinification).ConfigureAwait(false);
                     }
@@ -222,13 +222,18 @@ namespace MediaBrowser.WebDashboard.Api
             }
         }
 
-        private bool IsCoreHtml(string path)
+        public bool IsCoreHtml(string path)
         {
             if (path.IndexOf("vulcanize", StringComparison.OrdinalIgnoreCase) != -1)
             {
                 return false;
             }
 
+            if (path.IndexOf(".template.html", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                return false;
+            }
+
             path = GetDashboardResourcePath(path);
             var parent = Path.GetDirectoryName(path);