X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=bb9bed55f42fff4e23fccac457cb0558a1e1876d;hb=b4bc48b5a6e331e1984922057b46915875099c15;hp=52aac2e943aca9e7f84dba5afab2f9407b570e10;hpb=1920aba45e9151c51e555709e0d05da9aac01fc3;p=wfpl.git

diff --git a/run.php b/run.php
index 52aac2e..bb9bed5 100644
--- a/run.php
+++ b/run.php
@@ -1,8 +1,8 @@
-<?php
+<?php  # Transitional; supports both template APIs
 
 #  2006 Public Domain
 #
-#  This file was placed into the public domain on November 16th, 2008 by it's
+#  This file was placed into the public domain on November 16th, 2008 by its
 #  sole author Jason Woofenden
 
 # This file facilitates making a site with mixed PHP and html files. All URLs
@@ -54,7 +54,7 @@ if(file_exists('code/config.php')) {
 # pass http://foo.com/bar.html to redirect to a full directory
 function run_php($dest = false) {
 	if($dest) {
-		# if it's got a : it must be a full URL, redirect
+		# if it has a : it must be a full URL, redirect
 		if(strpos($dest, ':')) {
 			redirect($dest);
 			exit();
@@ -101,7 +101,7 @@ 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(key,value) on the template
+	# 3) a hash of key/value pairs to be tem_set() on the template
 	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);
@@ -155,10 +155,7 @@ function run_php($dest = false) {
 			# site, copy all template sections that have been show()n to the
 			# site-wide template
 			if($GLOBALS['wfpl_template']) {
-				$sections = tem_top_subs();
-				if($sections) foreach($sections as $name => $val) {
-					$GLOBALS['wfpl_main_template']->append($name, $val);
-				}
+				$GLOBALS['wfpl_main_template']->merge($GLOBALS['wfpl_template']);
 			}
 
 			$GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template'];