Fixed a couple of host injection bugs.

haacked · Jun 5, 2011 · d26681c · d26681c
1 parent 3225725
commit d26681c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/src/Subtext.Framework/Web/SubtextPage.cs b/src/Subtext.Framework/Web/SubtextPage.cs
@@ -52,7 +52,7 @@ public AdminUrlHelper AdminUrl
         {
             get
             {
-                if(_adminUrlHelper == null)
+                if (_adminUrlHelper == null)
                 {
                     _adminUrlHelper = new AdminUrlHelper(Url);
                 }

diff --git a/src/Subtext.Web/UI/Controls/Aggregate/AggregatePage.cs b/src/Subtext.Web/UI/Controls/Aggregate/AggregatePage.cs
@@ -15,6 +15,7 @@
 
 #endregion
 
+using System;
 using Ninject;
 using Subtext.Framework;
 using Subtext.Framework.Web.Handlers;
@@ -23,8 +24,13 @@ namespace Subtext.Web.UI.Controls
 {
     public class AggregatePage : SubtextPage
     {
+        public HostInfo HostInfo
+        {
+            get { return Host.Value; }
+        }
+
         [Inject]
-        public HostInfo HostInfo { get; set; }
+        public Lazy<HostInfo> Host { get; set; }
 
         public int? GetGroupIdFromQueryString()
         {

diff --git a/src/Subtext.Web/Web.config b/src/Subtext.Web/Web.config
@@ -168,7 +168,7 @@
     <add key="ProxyUsername" value="" />
     <add key="ProxyPassword" value="" />
     <!-- Aggregate Blog Stuff -->
-    <add key="AggregateEnabled" value="true" />
+    <add key="AggregateEnabled" value="false" />
     <add key="AggregateTitle" value="A Subtext Community" />
     <add key="AggregateUrl" value="http://localhost:2732/" />
     <add key="AggregateDescription" value=".NET by Subtext" />

diff --git a/src/Subtext.Web/aspx/AggDefault.aspx.cs b/src/Subtext.Web/aspx/AggDefault.aspx.cs
@@ -76,7 +76,7 @@ private void SetStyle()
             //TODO: This is hard-coded to look in the simple skin for aggregate blogs. We should change this later.
             string aggregateSkin = HostInfo.GetAggregateSkin().TemplateFolder;
             Style.Text = string.Format(style, apppath, "Skins/" + aggregateSkin + "/Style.css") + Environment.NewLine +
-                         string.Format(style, apppath, "Scripts/jquery.lightbox-0.5.css");
+                         string.Format(style, apppath, "css/lightbox.css");
         }
     }
 }
diff --git a/src/Subtext.Web/aspx/Install/Step03_CreateBlog.aspx.cs b/src/Subtext.Web/aspx/Install/Step03_CreateBlog.aspx.cs
@@ -41,8 +41,17 @@ public IEntryPublisher EntryPublisher
             set;
         }
 
-        [Inject]
+
         protected HostInfo HostInfo
+        {
+            get
+            {
+                return Host.Value;
+            }
+        }
+
+        [Inject]
+        public Lazy<HostInfo> Host
         {
             get;
             set;