lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-03 03:58:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixing Setup

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-12-28 15:18:42 -08:00
parent f3b8003b4a
commit 42ba61469b
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
View File

@@ -124,9 +124,9 @@ namespace Orchard.Setup.Controllers {
// redirect to the welcome page.
return Redirect("~/");
} catch (Exception) {
Logger.Error(T("Setup failed:").Text);
_notifier.Error(T("Setup failed:"));
} catch (Exception ex) {
Logger.Error(ex, "Setup failed");
_notifier.Error(T("Setup failed: {0}", ex.Message));
model.Recipes = recipes;
foreach (var recipe in recipes.Where(recipe => recipe.Name == model.Recipe)) {

4
src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
View File

@@ -79,9 +79,7 @@ namespace Orchard.Setup.Services {
"PackagingServices", "Orchard.Packaging", "Gallery", "Orchard.Recipes",
};
if (context.EnabledFeatures != null) {
context.EnabledFeatures = hardcoded.Union(context.EnabledFeatures).Distinct();
}
context.EnabledFeatures = hardcoded.Union(context.EnabledFeatures ?? Enumerable.Empty<string>()).Distinct();
var shellSettings = new ShellSettings(_shellSettings);