clean up include paths and docs

[wfpl.git] / main.php
diff --git a/main.php b/main.php

index e088d67..f5be944 100644 (file)
--- a/main.php
+++ b/main.php
@@ -77,7 +77,7 @@ function wfpl_main($dest = false) {
         if(function_exists('cms_display')) {
                 $cms_content = cms_display($basename, $GLOBALS['wfpl_main_template']);
                 if(is_string($cms_content)) {
-                       run_php($cms_content);
+                       wfpl_main($cms_content);
                         return;
                 }
         } else {
@@ -88,7 +88,7 @@ function wfpl_main($dest = false) {
                 header('HTTP/1.0 404 File Not Found');
                 if(file_exists('error_404.php') || file_exists('error_404.html')) {
                         $GLOBALS['error_basename'] = $basename;
-                       run_php('error_404');
+                       wfpl_main('error_404');
                         return;
                 } else {
                         echo '<!DOCTYPE html><html><head><title>404</title></head><body><h1>404 File Not Found</h1></body></html>';
@@ -110,7 +110,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) {
@@ -134,8 +134,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();