X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run2.php;h=333ba755a24e3287602dc7650e6955dcc7a903d9;hb=aed28998bb6d6be4f35ccc300de8a004507849c9;hp=c67c27e1a39d2bc874c08bad0a706f869863ae6a;hpb=39a2bf23396095c46585cc88c15d0f9e37a44fcb;p=wfpl.git

diff --git a/run2.php b/run2.php
index c67c27e..333ba75 100644
--- a/run2.php
+++ b/run2.php
@@ -1,8 +1,8 @@
-<?php
+<?php  # For new template API
 
 #  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
@@ -136,8 +136,8 @@ function run_php($dest = false) {
 	if(file_exists("template.html")) {
 		$template = parse_template_file("template.html");
 		if($html_exists) {
-			$subs = parse_template_file($html_file);
-			$template = merge_templates($template, $subs);
+			$page_template = parse_template_file($html_file);
+			$template = merge_templates($template, $page_template);
 		}
 	} elseif($html_exists) {
 		$template = parse_template_file("$html_file");