X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=8c780de35483623f8a74c0a36b90b081909f0b63;hb=fbb154b93a7017979174daf26cc77a1efaa3d5e5;hp=52aac2e943aca9e7f84dba5afab2f9407b570e10;hpb=1920aba45e9151c51e555709e0d05da9aac01fc3;p=wfpl.git
diff --git a/run.php b/run.php
index 52aac2e..8c780de 100644
--- a/run.php
+++ b/run.php
@@ -1,8 +1,8 @@
-404404 File Not Found
';
+ echo '404404 File Not Found
';
exit();
}
}
@@ -141,7 +141,7 @@ function run_php($dest = false) {
run_php($other);
return;
}
- } else {
+ } elseif($html_exists) {
$sub_names = tem_top_sub_names();
foreach($sub_names as $sub_name) {
tem_sub($sub_name);
@@ -155,10 +155,7 @@ function run_php($dest = false) {
# site, copy all template sections that have been show()n to the
# site-wide template
if($GLOBALS['wfpl_template']) {
- $sections = tem_top_subs();
- if($sections) foreach($sections as $name => $val) {
- $GLOBALS['wfpl_main_template']->append($name, $val);
- }
+ $GLOBALS['wfpl_main_template']->merge($GLOBALS['wfpl_template']);
}
$GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template'];