lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-03 03:58:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#19158: Fixing exception when a code Shape alternate is created

Browse Source 
If a Zone alternate is created, it will be empty and it might result int the
site rendering an empty page.

Work Item:

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-10-18 11:43:34 -07:00
parent 8eb360784b
commit 76c203dd14
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Modules/Orchard.DesignerTools/Controllers/AlternateController.cs
View File

@@ -6,8 +6,7 @@ using Orchard.Security;
using Orchard.Mvc.Extensions; using Orchard.Mvc.Extensions;
using Orchard.Themes; using Orchard.Themes;
namespace Orchard.DesignerTools.Controllers namespace Orchard.DesignerTools.Controllers {
{
[Themed] [Themed]
public class AlternateController : Controller { public class AlternateController : Controller {
private readonly IWebSiteFolder _webSiteFolder; private readonly IWebSiteFolder _webSiteFolder;
@@ -30,9 +29,10 @@ namespace Orchard.DesignerTools.Controllers
var currentTheme = _themeManager.GetRequestTheme(Request.RequestContext); var currentTheme = _themeManager.GetRequestTheme(Request.RequestContext);
var alternateFilename = Server.MapPath(Path.Combine(currentTheme.Location, currentTheme.Id, "Views", alternate)); var alternateFilename = Server.MapPath(Path.Combine(currentTheme.Location, currentTheme.Id, "Views", alternate));
var isCodeTemplate = template.Contains("::");
// use same extension as template, or ".cshtml" if it's a code template)) // use same extension as template, or ".cshtml" if it's a code template))
if (_webSiteFolder.FileExists(template)) { if (!isCodeTemplate && _webSiteFolder.FileExists(template)) {
alternateFilename += Path.GetExtension(template); alternateFilename += Path.GetExtension(template);
using (var stream = System.IO.File.Create(alternateFilename)) { using (var stream = System.IO.File.Create(alternateFilename)) {
@@ -41,7 +41,7 @@ namespace Orchard.DesignerTools.Controllers
} }
else { else {
alternateFilename += ".cshtml"; alternateFilename += ".cshtml";
using (System.IO.File.Create(alternateFilename)) {} using (System.IO.File.Create(alternateFilename)) { }
} }
return this.RedirectLocal(returnUrl); return this.RedirectLocal(returnUrl);