DNN-6518 Workflow/Versions not enabled after non-English Installation

additional cleanup (and removal of new, unneeded API method)
dnnsoftware · Feb 1, 2015 · b865d28 · b865d28
1 parent 052626f
commit b865d28
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 28 deletions.
diff --git 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
@@ -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
@@ -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
@@ -230,13 +230,15 @@ 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
             {
                 foreach (Locale portalLocale in LocaleController.Instance.GetLocales(portalId).Values)
                 {
                     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
@@ -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 */
 /************************/