From ea9653fa83c26bbca87a49899dd9486ab73b1d93 Mon Sep 17 00:00:00 2001 From: Shannon Deminick Date: Sun, 12 May 2013 21:12:55 -1000 Subject: [PATCH] patches fix for #U4-2214 --- src/umbraco.businesslogic/BasePages/BasePage.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/umbraco.businesslogic/BasePages/BasePage.cs b/src/umbraco.businesslogic/BasePages/BasePage.cs index 25c0d5e0ec..25a09f9b25 100644 --- a/src/umbraco.businesslogic/BasePages/BasePage.cs +++ b/src/umbraco.businesslogic/BasePages/BasePage.cs @@ -261,9 +261,17 @@ namespace umbraco.BasePages return encTicket.DecryptWithMachineKey(); } } - catch (HttpException ex) + catch (Exception ex) { // we swallow this type of exception as it happens if a legacy (pre 4.8.1) cookie is set + if (ex is ArgumentException || ex is FormatException || ex is HttpException) + { + StateHelper.Cookies.UserContext.Clear(); + } + else + { + throw; + } } } return "";