From 81ff6b30c3446485b6295798f3972f3977e79c92 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebros@microsoft.com>
Date: Thu, 30 Sep 2010 12:58:48 -0700
Subject: [PATCH] Corrected previous merge

--HG--
branch : dev
---
 .../Modules/Orchard.Themes/Services/ThemeService.cs         | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs b/src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
index 71e1c2772..c8b4ea08b 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
@@ -11,7 +11,6 @@ using Orchard.ContentManagement;
 using Orchard.Modules;
 using Orchard.Settings;
 using Orchard.Themes.Models;
-using Orchard.Environment.Descriptor;
 
 namespace Orchard.Themes.Services {
     [UsedImplicitly]
@@ -83,7 +82,6 @@ namespace Orchard.Themes.Services {
             foreach (var descriptor in _extensionManager.AvailableExtensions()) {
                 if (String.Equals(descriptor.Name, name, StringComparison.OrdinalIgnoreCase)) {
                     return CreateTheme(descriptor);
-                                         Zones = descriptor.Zones ?? String.Empty,
                 }
             }
             return null;
@@ -103,7 +101,6 @@ namespace Orchard.Themes.Services {
 
                 ITheme theme = CreateTheme(descriptor);
 
-                                                Zones = descriptor.Zones ?? String.Empty,
                 if (!theme.Tags.Contains("hidden")) {
                     themes.Add(theme);
                 }
@@ -127,7 +124,8 @@ namespace Orchard.Themes.Services {
                 HomePage = descriptor.WebSite ?? String.Empty,
                 ThemeName = descriptor.Name,
                 Version = descriptor.Version ?? String.Empty,
-                Tags = descriptor.Tags ?? String.Empty
+                Tags = descriptor.Tags ?? String.Empty,
+                Zones = descriptor.Zones ?? String.Empty,
             };
         }
     }