X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=run.php;h=8c780de35483623f8a74c0a36b90b081909f0b63;hb=19f414ad930c8b98149a2d22c6b319983392c8c0;hp=8e7941ea7fb0efd2db75d1aa3fdc50e422794a21;hpb=5a2e4c4c0c9b3bfbc9a2d160ce81d636e2002107;p=wfpl.git
diff --git a/run.php b/run.php
index 8e7941e..8c780de 100644
--- a/run.php
+++ b/run.php
@@ -1,4 +1,4 @@
-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'];