From: Josh Grams Date: Sat, 22 Aug 2009 16:20:09 +0000 (-0400) Subject: * run.php: minor changes. X-Git-Url: https://jasonwoof.com/gitweb/?a=commitdiff_plain;h=db864ee66dd1170c74c1adae6be91ce3109b760e;p=wfpl.git * run.php: minor changes. --- diff --git a/run.php b/run.php index 3d0b1d4..c67c27e 100644 --- a/run.php +++ b/run.php @@ -78,6 +78,8 @@ function run_php($dest = false) { } } + $GLOBALS['basename'] = $basename; + $html_file = "$basename.html"; $php_file = "$basename.php"; @@ -88,12 +90,14 @@ function run_php($dest = false) { # 1) false to indicate that there's no cms content for this basename # 2) a string to request a soft/full redirect just like foo_main() # 3) a hash of key/value pairs to be added to the template - if(function_exists('cms_get')) { - $cms_content = cms_get($basename); + if(function_exists('cms_display')) { + $cms_content = cms_display($basename); if(is_string($cms_content)) { run_php($cms_content); return; } + } else { + $cms_content = false; } if($php_exists) { @@ -113,10 +117,11 @@ function run_php($dest = false) { return; } else { echo '404

404 File Not Found

'; + exit(); } } - $data = &$GLOBALS['wfpl_tem_data']; + $data =& $GLOBALS['wfpl_tem_data']; $data['basename'] = $basename; if(function_exists('display_messages')) { display_messages();