yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge issue

Browse Source
This commit is contained in:
Shannon
2013-07-23 13:46:59 +10:00
parent 4df80eb976
commit d9deae39ef
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
View File

@@ -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