X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=32aebef03187f580570721a5a88a69b676529632;hb=f13c842a97d0e1b67fb8f9599be48159f9d2d9ab;hp=197dc76ed1325d59de9b772d1a6dc122324574db;hpb=8caa06f2e35edfe1d923fc8fcfe732e425b6b475;p=wfpl.git

diff --git a/run.php b/run.php
index 197dc76..32aebef 100644
--- a/run.php
+++ b/run.php
@@ -1,4 +1,4 @@
-<?php
+<?php  # Transitional; supports both template APIs
 
 #  2006 Public Domain
 #
@@ -99,9 +99,9 @@ function run_php($dest = false) {
 	}
 
 	# cms_get can return one of:
-	# 1) false to indicate that there's no cms content for this basename
-	# 2) a string to indicate a soft/full redirect just as foo_main()
-	# 3) a hash of key/value pairs to be tem_set() on the template
+	# 1) true to indicate that there is cms content (so no 404)
+	# 2) false to indicate that there's no cms content for this basename
+	# 3) a string to indicate a soft/full redirect just as foo_main()
 	if(function_exists('cms_display')) {
 		$cms_content = cms_display($basename, $GLOBALS['wfpl_main_template']);
 		if(is_string($cms_content)) {
@@ -141,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);