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

Updated the new module to handle when no template is found (blank page) instead of the handlers (webforms or mvc) handling this.

Browse Source
This commit is contained in:
Shannon Deminick
2012-08-29 08:17:31 +07:00
parent c251c9f0d3
commit b86d513aff
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -244,6 +244,9 @@
<Compile Include="Dictionary\UmbracoCultureDictionary.cs" />
<Compile Include="Dictionary\UmbracoCultureDictionaryFactory.cs" />
<Compile Include="IApplicationEventHandler.cs" />
<Compile Include="umbraco.presentation\Default.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="umbraco.presentation\LibraryCacheRefresher.cs" />
<Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProviderAccessUpdate.cs" />
<Compile Include="XmlPublishedContentStore.cs" />
@@ -354,13 +357,6 @@
<Compile Include="umbraco.presentation\content.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="umbraco.presentation\default.aspx.cs">
<DependentUpon>default.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="umbraco.presentation\default.aspx.designer.cs">
<DependentUpon>default.aspx</DependentUpon>
</Compile>
<Compile Include="umbraco.presentation\helper.cs">
<SubType>Code</SubType>
</Compile>
@@ -1867,7 +1863,6 @@
<Content Include="umbraco.presentation\umbraco\controls\Images\UploadMediaImage.ascx" />
<Content Include="umbraco.presentation\umbraco\controls\Tree\TreeControl.ascx" />
<Content Include="umbraco.presentation\umbraco\Search\QuickSearch.ascx" />
<Content Include="umbraco.presentation\default.aspx" />
<Content Include="umbraco.presentation\install\default.aspx" />
<Content Include="umbraco.presentation\install\steps\license.ascx" />
<Content Include="umbraco.presentation\umbraco\actions\delete.aspx" />

9
src/Umbraco.Web/UmbracoModule.cs
View File

@@ -116,6 +116,15 @@ namespace Umbraco.Web
}
else
{
if (!docreq.HasTemplate)
{
//TODO: If there is no template then we should figure out what to render, in v4 it is just a blank page but some think
// that it should be a 404. IMO I think it should just be a blank page because it is still a content item in the
//umbraco system, perhaps this should be put on the mail list? For now we will just make it a blank page
httpContext.Response.Clear();
httpContext.Response.End();
}
//TODO: Detect MVC vs WebForms
var isMvc = true;