X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=main.php;h=3d4a751a9d15de388de79e1464fd19cdf9790491;hp=f5be944510c45597430754b61bca164047922336;hb=203b704003fa9bfbe823e5ebc8d8e7cff919a073;hpb=c852a59520b9b39903d16313e1821754539eabca diff --git a/main.php b/main.php index f5be944..3d4a751 100644 --- a/main.php +++ b/main.php @@ -121,12 +121,12 @@ function wfpl_main($dest = false) { } # Check for $GLOBALS['wfpl_template'] because it might have been set (or unset) by the php script. - if($GLOBALS['wfpl_template'] || $GLOBALS['wfpl_main_template']) { - if($GLOBALS['wfpl_main_template']) { + if(isset($GLOBALS['wfpl_template']) || isset($GLOBALS['wfpl_main_template'])) { + if(isset($GLOBALS['wfpl_main_template'])) { # if there was a template for that page, and one for the whole # site, copy all template sections that have been show()n to the # site-wide template - if($GLOBALS['wfpl_template']) { + if(isset($GLOBALS['wfpl_template'])) { $GLOBALS['wfpl_main_template']->merge($GLOBALS['wfpl_template']); }