From: Jason Woofenden <jason283@herkamire.com>
Date: Thu, 28 May 2009 10:27:07 +0000 (-0400)
Subject: fix run.php for case where [basename].php and template.html exist, but not [basename... 
X-Git-Url: https://jasonwoof.com/gitweb/?a=commitdiff_plain;h=1920aba45e9151c51e555709e0d05da9aac01fc3;p=wfpl.git

fix run.php for case where [basename].php and template.html exist, but not [basename].html
---

diff --git a/run.php b/run.php
index bbf2ce6..52aac2e 100644
--- a/run.php
+++ b/run.php
@@ -149,19 +149,32 @@ function run_php($dest = false) {
 	}
 
 	# Check for $GLOBALS['wfpl_template'] because it might have been set (or unset) by the php script.
-	if($GLOBALS['wfpl_template']) {
-		if(isset($GLOBALS['wfpl_main_template'])) {
-			$sections = tem_top_subs();
-			if($sections) foreach($sections as $name => $val) {
-				$GLOBALS['wfpl_main_template']->append($name, $val);
+	if($GLOBALS['wfpl_template'] || $GLOBALS['wfpl_main_template']) {
+		if($GLOBALS['wfpl_main_template']) {
+			# if there was a template for that page, and one for the whole
+			# 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_template'] = $GLOBALS['wfpl_main_template'];
 		}
 
+		# If you have a site-wide template (template.html) then messages will
+		# be displayed there. If you instead want messages displayed on your
+		# page, call display_messages() from your page_main().
+		#
+		# Either way, you'll need to require_once('code/wfpl/messages.php')
+		# or require_once('code/wfpl/session_messages.php'). code/config.php
+		# is a nice place to do this.
 		if(function_exists('display_messages')) {
 			display_messages();
 		}
+
 		tem_output();
 	}
 }