X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=main.php;h=6e0500901b1f4b4ce172e8a676580c0cbe84daef;hp=e088d67218753c5aa0b3836a4d805cff0dae38bb;hb=HEAD;hpb=23dfbcc20fc6d20fb5be211e5af50cdcb8565c8e
diff --git a/main.php b/main.php
index e088d67..6e05009 100644
--- a/main.php
+++ b/main.php
@@ -1,10 +1,10 @@
404404 File Not Found
';
@@ -110,7 +111,7 @@ function wfpl_main($dest = false) {
# files can return a basename or URL of a page to be run/displayed
$other = file_run($php_file);
if($other) {
- run_php($other);
+ wfpl_main($other);
return;
}
} elseif($html_exists) {
@@ -121,12 +122,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']);
}
@@ -134,8 +135,8 @@ function wfpl_main($dest = false) {
}
- # You'll probably want to require_once(__DIR__.'/'.'code/wfpl/messages.php') or
- # require_once(__DIR__.'/'.'code/wfpl/session_messages.php') in code/config.php
+ # You'll probably want to require_once(__DIR__.'/'.'lib/wfpl/messages.php') or
+ # require_once(__DIR__.'/'.'lib/wfpl/session_messages.php') in config.php
if(function_exists('display_messages')) {
if(function_exists('atexit_now')) {
atexit_now();