WI#30726 - Add check for UseAspNetMasterPages thus skipping the checkForMaster

that is not necessary
2012-02-11 01:13:41 +05:00
parent 90338093ba
commit 7ddecca574
1 changed files with 3 additions and 1 deletions
--- a/umbraco/presentation/template.cs
+++ b/umbraco/presentation/template.cs
@@ -532,7 +532,9 @@ namespace umbraco
                    }
                }
            }
-            checkForMaster(templateID);
+            // Only check for master on legacy templates - can show error when using master pages.
+            if(!UmbracoSettings.UseAspNetMasterPages)
+                checkForMaster(templateID);
        }

        private void checkForMaster(int templateID) {