yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes merge issues

Browse Source
This commit is contained in:
Shannon Deminick
2013-04-06 01:41:06 +06:00
parent 7dcfcaf339
commit 01bf0bcfa5
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -278,14 +278,14 @@
</Compile>
<Compile Include="Install\Default.aspx.cs">
<DependentUpon>default.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="config\splashes\NoNodes.aspx.cs">
<DependentUpon>noNodes.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="config\splashes\NoNodes.aspx.designer.cs">
<DependentUpon>noNodes.aspx</DependentUpon>
<DependentUpon>noNodes.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Install\Default.aspx.designer.cs">

4
src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.cs
View File

@@ -13,8 +13,8 @@ namespace Umbraco.Web.UI.Config.Splashes
{
base.OnInit(e);
var store = UmbracoContext.Current.RoutingContext.PublishedContentStore;
if (store.HasContent(UmbracoContext.Current))
var store = UmbracoContext.Current.ContentCache;
if (store.HasContent())
{
//if there is actually content, go to the root
Response.Redirect("~/");