X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=a310e3f7728c2daa3a4c3f0b6765a96c0bbb2605;hb=e9646530d44ce4d74fc4c8e39f9080360689c517;hp=27918526de258bad5c9afc0cec412d42043eb60e;hpb=697d643083cb5829c96ed7854bd63309c8f325f3;p=wfpl.git

diff --git a/run.php b/run.php
index 2791852..a310e3f 100644
--- a/run.php
+++ b/run.php
@@ -72,7 +72,7 @@ function run_php($dest = false) {
 	} else { # no dest arg
 		$basename = $_SERVER['REDIRECT_URL'];
 		$basename = ereg_replace('.*/', '', $basename);
-		$basename = ereg_replace('\.html$', '', $basename);
+		$basename = ereg_replace('\.html?$', '', $basename);
 		if($basename == '') {
 			$basename = 'index';
 		}
@@ -89,7 +89,7 @@ function run_php($dest = false) {
 	if(file_exists('template.html')) {
 		$GLOBALS['wfpl_main_template'] = new tem();
 		$GLOBALS['wfpl_main_template']->load("template.html");
-		$GLOBALS['wfpl_main_template']->set('wfpl_basename', $basename);
+		$GLOBALS['wfpl_main_template']->set('$basename', $basename);
 	}
 
 	# cms_get can return one of:
@@ -155,14 +155,13 @@ function run_php($dest = false) {
 			$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.
+
+		# You'll probably want to require_once('code/wfpl/messages.php') or
+		# require_once('code/wfpl/session_messages.php') in code/config.php
 		if(function_exists('display_messages')) {
+			if(function_exists('atexit_now')) {
+				atexit_now();
+			}
 			display_messages();
 		}