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

Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7

Browse Source
This commit is contained in:
Shannon
2015-07-20 13:45:47 +02:00
parent 9b1f4ecff9 3c884b583e
commit 6095f0233e
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/NuSpecs/tools/Web.config.install.xdt
View File

@@ -160,7 +160,7 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly xdt:Transform="Insert"> <dependentAssembly xdt:Transform="Insert">
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly xdt:Transform="Insert"> <dependentAssembly xdt:Transform="Insert">
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />

2
src/Umbraco.Web.UI/web.Template.config
View File

@@ -260,7 +260,7 @@
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />

8
src/Umbraco.Web/umbraco.presentation/template.cs
View File

@@ -497,8 +497,12 @@ namespace umbraco
var t = ApplicationContext.Current.ApplicationCache.GetCacheItem( var t = ApplicationContext.Current.ApplicationCache.GetCacheItem(
string.Format("{0}{1}", CacheKeys.TemplateFrontEndCacheKey, tId), () => string.Format("{0}{1}", CacheKeys.TemplateFrontEndCacheKey, tId), () =>
{ {
using (var templateData = SqlHelper.ExecuteReader("select nodeId, alias, master, text, design from cmsTemplate inner join umbracoNode node on node.id = cmsTemplate.nodeId where nodeId = @templateID", SqlHelper.CreateParameter("@templateID", templateID))) using (var templateData = SqlHelper.ExecuteReader(@"select nodeId, alias, node.parentID as master, text, design
{ from cmsTemplate
inner join umbracoNode node on (node.id = cmsTemplate.nodeId)
where nodeId = @templateID",
SqlHelper.CreateParameter("@templateID", templateID)))
{
if (templateData.Read()) if (templateData.Read())
{ {
// Get template master and replace content where the template // Get template master and replace content where the template