From b865d28d017e3d70ae108f0fa51004a1e0897457 Mon Sep 17 00:00:00 2001
From: Cathal Connolly <cathal@dnncorp.com>
Date: Sun, 1 Feb 2015 23:37:22 +0000
Subject: [PATCH] DNN-6518 Workflow/Versions not enabled after non-English
 Installation additional cleanup (and removal of new, unneeded API method)

---
 .../DotNetNuke.Web/Api/PortalAliasRouteManager.cs |  2 +-
 .../Library/Entities/Portals/IPortalController.cs |  6 ------
 .../Library/Entities/Portals/PortalController.cs  |  6 ------
 .../Library/Services/Cache/CachingProvider.cs     |  2 ++
 .../SqlDataProvider/07.04.00.SqlDataProvider      | 15 ---------------
 5 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/DNN Platform/DotNetNuke.Web/Api/PortalAliasRouteManager.cs b/DNN Platform/DotNetNuke.Web/Api/PortalAliasRouteManager.cs
index 54790800e25..8f7b5ea24de 100644
--- a/DNN Platform/DotNetNuke.Web/Api/PortalAliasRouteManager.cs	
+++ b/DNN Platform/DotNetNuke.Web/Api/PortalAliasRouteManager.cs	
@@ -104,7 +104,7 @@ public IEnumerable<int> GetRoutePrefixCounts()
                 //when a new portal is added so cache them until that time
 
                 
-                var portals = PortalController.Instance.GetAllPortals();
+                var portals = PortalController.Instance.GetPortals();
                
 
                 var segmentCounts1 = new List<int>();
diff --git a/DNN Platform/Library/Entities/Portals/IPortalController.cs b/DNN Platform/Library/Entities/Portals/IPortalController.cs
index 032b4b3c19b..850be5b02cc 100644
--- a/DNN Platform/Library/Entities/Portals/IPortalController.cs	
+++ b/DNN Platform/Library/Entities/Portals/IPortalController.cs	
@@ -131,12 +131,6 @@ int CreatePortal(string portalName, UserInfo adminUser, string description, stri
         /// <returns>ArrayList of PortalInfo objects</returns>
         ArrayList GetPortals();
 
-        /// <summary>
-        /// returns list of portals 
-        /// does not require a culturecode, as function may be called earlier than a culture is available
-        /// </summary>
-        /// <returns></returns>
-        List<PortalInfo> GetAllPortals();
 
         /// <summary>
         /// Gets the portal settings dictionary.
diff --git a/DNN Platform/Library/Entities/Portals/PortalController.cs b/DNN Platform/Library/Entities/Portals/PortalController.cs
index a034160941c..a2086b21159 100644
--- a/DNN Platform/Library/Entities/Portals/PortalController.cs	
+++ b/DNN Platform/Library/Entities/Portals/PortalController.cs	
@@ -2368,12 +2368,6 @@ public ArrayList GetPortals()
 			return new ArrayList(GetPortalList(Null.NullString));
 		}
 
-		public List<PortalInfo> GetAllPortals()
-        {
-            List<PortalInfo> portals = CBO.FillCollection<PortalInfo>(DataProvider.Instance().GetAllPortals());
-            return portals;
-        }
-
         //public ArrayList GetPortals()
         //{
         //    return new ArrayList(GetPortalList(Localization.SystemLocale));
diff --git a/DNN Platform/Library/Services/Cache/CachingProvider.cs b/DNN Platform/Library/Services/Cache/CachingProvider.cs
index 402c4ce0528..ca174ccb8b4 100644
--- a/DNN Platform/Library/Services/Cache/CachingProvider.cs	
+++ b/DNN Platform/Library/Services/Cache/CachingProvider.cs	
@@ -230,6 +230,7 @@ private void ClearPortalCacheInternal(int portalId, bool cascade, bool clearRunt
                 //At least attempt to remove default locale
                 string defaultLocale = PortalController.GetPortalDefaultLanguage(portalId);
                 RemoveCacheKey(String.Format(DataCache.PortalCacheKey, portalId, defaultLocale), clearRuntime);
+                RemoveCacheKey(String.Format(DataCache.PortalCacheKey, portalId, Null.NullString), clearRuntime);
             }
             else
             {
@@ -237,6 +238,7 @@ private void ClearPortalCacheInternal(int portalId, bool cascade, bool clearRunt
                 {
                     RemoveCacheKey(String.Format(DataCache.PortalCacheKey, portalId, portalLocale.Code), clearRuntime);
                 }
+                RemoveCacheKey(String.Format(DataCache.PortalCacheKey, portalId, Null.NullString), clearRuntime);
             }
             if (cascade)
             {
diff --git a/Website/Providers/DataProviders/SqlDataProvider/07.04.00.SqlDataProvider b/Website/Providers/DataProviders/SqlDataProvider/07.04.00.SqlDataProvider
index 17588b098ad..261719cff16 100644
--- a/Website/Providers/DataProviders/SqlDataProvider/07.04.00.SqlDataProvider
+++ b/Website/Providers/DataProviders/SqlDataProvider/07.04.00.SqlDataProvider
@@ -2779,21 +2779,6 @@ SELECT @PortalID
 
 GO
 
-/* Add GetAllPortals Procedure */
-/*******************************/
-
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}[{objectQualifier}GetAllPortals]') AND type in (N'P', N'PC'))
-	DROP PROCEDURE {databaseOwner}[{objectQualifier}GetAllPortals]
-GO
-
-CREATE PROCEDURE {databaseOwner}[{objectQualifier}GetAllPortals]
-	AS
-	SELECT *
-	FROM       
-    {databaseOwner}{objectQualifier}vw_Portals
-	ORDER BY PortalName
-
-GO
 
 /* GetPortals Procedure */
 /************************/