From d9deae39efeecc2c04fa0a30dd7db9ae28c9f2af Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 23 Jul 2013 13:46:59 +1000 Subject: [PATCH] fixed merge issue --- .../umbraco/webservices/legacyAjaxCalls.asmx.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs index 9510676701..ecb13f2599 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs @@ -67,10 +67,16 @@ namespace umbraco.presentation.webservices int intNodeId; if (nodeType == "memberGroup") { - presentation.create.dialogHandler_temp.Delete(nodeType, 0, alias); + LegacyDialogHandler.Delete( + new HttpContextWrapper(HttpContext.Current), + UmbracoUser, + nodeType, 0, nodeId); } - else if (int.TryParse(nodeId, out intNodeID) && nodeType != "member") // Fix for #26965 - numeric member login gets parsed as nodeId + else if (int.TryParse(nodeId, out intNodeId) && nodeType != "member") // Fix for #26965 - numeric member login gets parsed as nodeId { + LegacyDialogHandler.Delete( + new HttpContextWrapper(HttpContext.Current), + UmbracoUser, nodeType, intNodeId, alias); } else