X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=bb9bed55f42fff4e23fccac457cb0558a1e1876d;hb=b4bc48b5a6e331e1984922057b46915875099c15;hp=8e7941ea7fb0efd2db75d1aa3fdc50e422794a21;hpb=5a2e4c4c0c9b3bfbc9a2d160ce81d636e2002107;p=wfpl.git

diff --git a/run.php b/run.php
index 8e7941e..bb9bed5 100644
--- a/run.php
+++ b/run.php
@@ -1,4 +1,4 @@
-<?php
+<?php  # Transitional; supports both template APIs
 
 #  2006 Public Domain
 #
@@ -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'];