Fix two tab deletion issues (dnnsoftware#6446)

bdukes · valadas · web-flow · commit 6a3512eeb2f5 · 2025-03-25T20:14:02.000+01:00
* Fix recursive delete failing Fixes dnnsoftware#6438 * Fix null reference when deleting tab that's already deleted --------- Co-authored-by: Daniel Valadas <info@danielvaladas.com>
diff --git a/DNN Platform/Library/Entities/Tabs/TabController.cs b/DNN Platform/Library/Entities/Tabs/TabController.cs
@@ -1221,7 +1221,8 @@ public void DeleteTab(int tabId, int portalId, bool deleteDescendants)
                 }
             }
 
-            this.DeleteTab(tabId, portalId);
+            this.HardDeleteTabInternal(tabId, portalId);
+            this.ClearCache(portalId);
         }
 
         /// <summary>Delete a Setting of a tab instance.</summary>
@@ -2902,7 +2903,10 @@ private void HardDeleteTabInternal(int tabId, int portalId)
                 contentController.DeleteContentItem(tab);
             }
 
-            EventManager.Instance.OnTabDeleted(new TabEventArgs { Tab = tab });
+            if (tab != null)
+            {
+                EventManager.Instance.OnTabDeleted(new TabEventArgs { Tab = tab });
+            }
         }
 
         private bool SoftDeleteChildTabs(int intTabid, PortalSettings portalSettings)

Original file line number	Diff line number	Diff line change
`@@ -1221,7 +1221,8 @@ public void DeleteTab(int tabId, int portalId, bool deleteDescendants)`
`1221`	`1221`	`}`
`1222`	`1222`	`}`
`1223`	`1223`
`1224`		`- this.DeleteTab(tabId, portalId);`
	`1224`	`+ this.HardDeleteTabInternal(tabId, portalId);`
	`1225`	`+ this.ClearCache(portalId);`
`1225`	`1226`	`}`
`1226`	`1227`
`1227`	`1228`	`/// <summary>Delete a Setting of a tab instance.</summary>`
`@@ -2902,7 +2903,10 @@ private void HardDeleteTabInternal(int tabId, int portalId)`
`2902`	`2903`	`contentController.DeleteContentItem(tab);`
`2903`	`2904`	`}`
`2904`	`2905`
`2905`		`- EventManager.Instance.OnTabDeleted(new TabEventArgs { Tab = tab });`
	`2906`	`+ if (tab != null)`
	`2907`	`+ {`
	`2908`	`+ EventManager.Instance.OnTabDeleted(new TabEventArgs { Tab = tab });`
	`2909`	`+ }`
`2906`	`2910`	`}`
`2907`	`2911`
`2908`	`2912`	`private bool SoftDeleteChildTabs(int intTabid, PortalSettings portalSettings)`