From a9450f9ed9d00ecef9b33043898e2f8211dac824 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Fri, 22 Feb 2019 11:02:37 +0100 Subject: [PATCH 1/3] Fix NullReferenceException when using LocalDb, because `SqlServerSyntaxProvider.ServerVersion` can be `null` --- src/Umbraco.Web/Install/InstallHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Install/InstallHelper.cs b/src/Umbraco.Web/Install/InstallHelper.cs index effb46c9b7..42da49aa39 100644 --- a/src/Umbraco.Web/Install/InstallHelper.cs +++ b/src/Umbraco.Web/Install/InstallHelper.cs @@ -101,7 +101,7 @@ namespace Umbraco.Web.Install if (syntax is SqlCeSyntaxProvider) dbProvider = "SqlServerCE"; else if (syntax is SqlServerSyntaxProvider) - dbProvider = (syntax as SqlServerSyntaxProvider).ServerVersion.IsAzure ? "SqlAzure" : "SqlServer"; + dbProvider = (syntax as SqlServerSyntaxProvider).ServerVersion?.IsAzure == true ? "SqlAzure" : "SqlServer"; return dbProvider; } From 064f637006f2053e51f2ca8ed3ebd084b89642f3 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Fri, 22 Feb 2019 11:23:57 +0100 Subject: [PATCH 2/3] #4708 - Fix for YSOD when exiting preview with on invariant cultures --- .../src/preview/preview.controller.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js index 7d6584d2f1..4733c58556 100644 --- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js @@ -113,7 +113,12 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi $scope.exitPreview = function () { var culture = $location.search().culture || getParameterByName("culture"); - var relativeUrl = "/" + $scope.pageId +'?culture='+ culture; + var relativeUrl = "/" + $scope.pageId; + + if(culture){ + relativeUrl +='?culture='+ culture; + } + window.top.location.href = "../preview/end?redir=" + encodeURIComponent(relativeUrl); }; From 02122f5e038eb895d715ec8e2b35ed49d600d751 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Fri, 22 Feb 2019 14:27:54 +0100 Subject: [PATCH 3/3] Revert "Fix NullReferenceException when using LocalDb, because `SqlServerSyntaxProvider.ServerVersion` can be `null`" This reverts commit a9450f9e. Root cause is fixed --- src/Umbraco.Web/Install/InstallHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Install/InstallHelper.cs b/src/Umbraco.Web/Install/InstallHelper.cs index 42da49aa39..effb46c9b7 100644 --- a/src/Umbraco.Web/Install/InstallHelper.cs +++ b/src/Umbraco.Web/Install/InstallHelper.cs @@ -101,7 +101,7 @@ namespace Umbraco.Web.Install if (syntax is SqlCeSyntaxProvider) dbProvider = "SqlServerCE"; else if (syntax is SqlServerSyntaxProvider) - dbProvider = (syntax as SqlServerSyntaxProvider).ServerVersion?.IsAzure == true ? "SqlAzure" : "SqlServer"; + dbProvider = (syntax as SqlServerSyntaxProvider).ServerVersion.IsAzure ? "SqlAzure" : "SqlServer"; return dbProvider; }