Fixes 29798: Importing Document Type with a Master set adds properties to incorrect tab

umbraco/cms/businesslogic/ContentType.cs

@@ -443,6 +443,18 @@ namespace umbraco.cms.businesslogic
             }
         }
 
+
+        /// <summary>
+        /// Clears the locally loaded tabs which forces them to be reloaded next time they requested
+        /// </summary>
+        public void ClearVirtualTabs()
+        {
+            foreach (TabI t in getVirtualTabs)
+                Tab.FlushCache(t.Id, t.ContentType);
+
+            m_VirtualTabs = null;
+        }
+
         /// <summary>
         /// The list of ContentType Id's that defines which Content (by ContentType) can be created as child 
         /// to the Content of this ContentType
@@ -823,16 +835,7 @@ namespace umbraco.cms.businesslogic
             return "ContentType_PropertyTypes_Content:" + this.Id;
         }
 
-        /// <summary>
-        /// Clears the locally loaded tabs which forces them to be reloaded next time they requested
-        /// </summary>
-        private void ClearVirtualTabs()
-        {
-            foreach (TabI t in getVirtualTabs)
-                Tab.FlushCache(t.Id, t.ContentType);
-
-            m_VirtualTabs = null;
-        }
+        
 
         /// <summary>
         /// Checks if we've loaded the virtual tabs into memory and if not gets them from the databse.

umbraco/cms/businesslogic/Packager/Installer.cs

@@ -675,6 +675,8 @@ namespace umbraco.cms.businesslogic.packager
             for (int t = 0; t < tabs.Length; t++)
                 tabNames += tabs[t].Caption + ";";
 
+           
+
             Hashtable ht = new Hashtable();
             foreach (XmlNode t in n.SelectNodes("Tabs/Tab"))
             {
@@ -685,7 +687,7 @@ namespace umbraco.cms.businesslogic.packager
                 }
             }
 
-
+            dt.ClearVirtualTabs();
             // Get all tabs in hashtable
             Hashtable tabList = new Hashtable();
             foreach (cms.businesslogic.ContentType.TabI t in dt.getVirtualTabs.ToList())