X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=bb9bed55f42fff4e23fccac457cb0558a1e1876d;hb=b4bc48b5a6e331e1984922057b46915875099c15;hp=09b51b56b5d7068e93fc7261348af4977b48a504;hpb=7596b1ca035ff09e584e915a6e5572ffb46d7625;p=wfpl.git
diff --git a/run.php b/run.php
index 09b51b5..bb9bed5 100644
--- a/run.php
+++ b/run.php
@@ -1,8 +1,8 @@
-404404 File Not Found
';
+ exit();
}
}
@@ -137,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);
@@ -145,19 +149,29 @@ function run_php($dest = false) {
}
# Check for $GLOBALS['wfpl_template'] because it might have been set (or unset) by the php script.
- if($GLOBALS['wfpl_template']) {
- if(isset($GLOBALS['wfpl_main_template'])) {
- $sections = tem_top_subs();
- if($sections) foreach($sections as $name => $val) {
- $GLOBALS['wfpl_main_template']->append($name, $val);
+ if($GLOBALS['wfpl_template'] || $GLOBALS['wfpl_main_template']) {
+ if($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']) {
+ $GLOBALS['wfpl_main_template']->merge($GLOBALS['wfpl_template']);
}
$GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template'];
}
+ # If you have a site-wide template (template.html) then messages will
+ # be displayed there. If you instead want messages displayed on your
+ # page, call display_messages() from your page_main().
+ #
+ # Either way, you'll need to require_once('code/wfpl/messages.php')
+ # or require_once('code/wfpl/session_messages.php'). code/config.php
+ # is a nice place to do this.
if(function_exists('display_messages')) {
display_messages();
}
+
tem_output();
}
}