Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
wfpl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* run.php, run2.php: doc fixes.
[wfpl.git]
/
run.php
diff --git
a/run.php
b/run.php
index
52aac2e
..
7f8abd8
100644
(file)
--- a/
run.php
+++ b/
run.php
@@
-1,8
+1,8
@@
-<?php
+<?php # Transitional; supports both template APIs
# 2006 Public Domain
#
# 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
# 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) {
# 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();
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()
# 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)) {
if(function_exists('cms_display')) {
$cms_content = cms_display($basename, $GLOBALS['wfpl_main_template']);
if(is_string($cms_content)) {
@@
-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']) {
# 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'];
}
$GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template'];