markmcavoy · markmcavoy · commit 65b0b616059e · 2016-08-25T16:32:58.000-04:00
fix so that we check to see if the site.master exists and if not we just roll back to a standard one. This can happen when the site us using a custom theme then the theme is removed. In the previous implementation this resulted in a blank page getting rendered. The error handling didn't seem to work
diff --git a/BlogEngine/BlogEngine.Core/Web/Controls/BlogBasePage.cs b/BlogEngine/BlogEngine.Core/Web/Controls/BlogBasePage.cs
@@ -279,8 +279,14 @@ string GetSiteMaster()
                     return path;
             }
 
-            return string.Format("{0}Custom/Themes/{1}/site.master", Utils.ApplicationRelativeWebRoot, 
-                BlogSettings.Instance.GetThemeWithAdjustments(null));
+            var siteMaster = string.Format("{0}Custom/Themes/{1}/site.master", Utils.ApplicationRelativeWebRoot, 
+                                            BlogSettings.Instance.GetThemeWithAdjustments(null));
+
+            if (System.IO.File.Exists(Server.MapPath(siteMaster)))
+                return siteMaster;
+            else
+                return string.Format("{0}Custom/Themes/Standard/site.master", Utils.ApplicationRelativeWebRoot);
+
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -279,8 +279,14 @@ string GetSiteMaster()`
`279`	`279`	`return path;`
`280`	`280`	`}`
`281`	`281`
`282`		`- return string.Format("{0}Custom/Themes/{1}/site.master", Utils.ApplicationRelativeWebRoot,`
`283`		`- BlogSettings.Instance.GetThemeWithAdjustments(null));`
	`282`	`+ var siteMaster = string.Format("{0}Custom/Themes/{1}/site.master", Utils.ApplicationRelativeWebRoot,`
	`283`	`+ BlogSettings.Instance.GetThemeWithAdjustments(null));`
	`284`	`+`
	`285`	`+ if (System.IO.File.Exists(Server.MapPath(siteMaster)))`
	`286`	`+ return siteMaster;`
	`287`	`+ else`
	`288`	`+ return string.Format("{0}Custom/Themes/Standard/site.master", Utils.ApplicationRelativeWebRoot);`
	`289`	`+`
`284`	`290`	`}`
`285`	`291`	`}`
`286`	`292`	`}`