Merge

--HG--
branch : dev

src/Orchard.Web/Core/Settings/Topology/ShellDescriptorManager.cs

@@ -86,7 +86,7 @@ namespace Orchard.Core.Settings.Topology {
             }
 
             _eventBus.Notify(
-                typeof(IShellDescriptorManager).FullName + ".UpdateShellDescriptor",
+                "ShellDescriptor_Changed",
                 null);
         }
     }

src/Orchard.Web/Modules/Orchard.MultiTenancy/Services/TenantService.cs

@@ -12,20 +12,12 @@ namespace Orchard.MultiTenancy.Services {
             _orchardHost = orchardHost;
         }
 
-        #region Implementation of ITenantService
-
         public IEnumerable<ShellSettings> GetTenants() {
             return _shellSettingsManager.LoadSettings();
         }
 
         public void CreateTenant(ShellSettings settings) {
             _shellSettingsManager.SaveSettings(settings);
-
-
-            // MultiTenancy: This will not be needed when host listens to event bus
-            _orchardHost.Reinitialize_Obsolete();
         }
-
-        #endregion
     }
 }

src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs

@@ -173,9 +173,6 @@ namespace Orchard.Setup.Controllers {
 
                 _shellSettingsManager.SaveSettings(shellSettings);
 
-                // MultiTenancy: This will not be needed when host listens to event bus
-                _orchardHost.Reinitialize_Obsolete();
-
                 // redirect to the welcome page.
                 return Redirect("~/");
             }