don't try to merge in the html file if there isn't one

[wfpl.git] / run.php

diff --git a/run.php b/run.php
index 8e7941e..bb9bed5 100644 (file)
--- 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'];