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
Merge branch 'master' of /home/jason/dev/git/wfpl
[wfpl.git]
/
template.php
diff --git
a/template.php
b/template.php
index
9a3de85
..
5b03754
100644
(file)
--- a/
template.php
+++ b/
template.php
@@
-96,6
+96,13
@@
class tem {
}
}
}
}
+ function show_separated($sub_template_name) {
+ if($this->get($sub_template_name)) {
+ $this->show($sub_template_name . '_sep');
+ }
+ $this->show($sub_template_name);
+ }
+
# this is used by tem::load() and should be otherwise useless
function _load(&$in, &$out, &$parents, &$parent) {
while($in) {
# this is used by tem::load() and should be otherwise useless
function _load(&$in, &$out, &$parents, &$parent) {
while($in) {
@@
-263,6
+270,12
@@
function tem_show($sub_template_name) {
$GLOBALS['wfpl_template']->show($sub_template_name);
}
$GLOBALS['wfpl_template']->show($sub_template_name);
}
+function tem_show_separated($sub_template_name) {
+ tem_init();
+ $GLOBALS['wfpl_template']->show_separated($sub_template_name);
+}
+
+
function tem_load($filename) {
tem_init();
$GLOBALS['wfpl_template']->load($filename);
function tem_load($filename) {
tem_init();
$GLOBALS['wfpl_template']->load($filename);
@@
-277,7
+290,8
@@
function tem_output($filename = false) {
# this is used in template_run() and should be of no other use
function template_filler($matches) {
# this is used in template_run() and should be of no other use
function template_filler($matches) {
- list($tag, $enc) = explode('.', $matches[1], 2);
+ $match = array_pop($matches);
+ list($tag, $enc) = explode('.', $match, 2);
$value = $GLOBALS['wfpl_template_keyval'][$tag];
if($enc) {
$encs = explode('.', $enc);
$value = $GLOBALS['wfpl_template_keyval'][$tag];
if($enc) {
$encs = explode('.', $enc);
@@
-299,7
+313,7
@@
function template_filler($matches) {
# returns the result.
function template_run($template, &$keyval) {
$GLOBALS['wfpl_template_keyval'] =& $keyval;
# returns the result.
function template_run($template, &$keyval) {
$GLOBALS['wfpl_template_keyval'] =& $keyval;
- return preg_replace_callback(array('|<!--~([^~]*)~-->|', '|~([^~]*)~|', '|<span class="template">([^<]*)</span>|', '|<p class="template">([^<]*)</p>|'), 'template_filler', $template);
+ return preg_replace_callback('`<!--~([^~]*)~-->|~([^~]*)~|<span class="template">([^<]*)</span>|<p class="template">([^<]*)</p>`', 'template_filler', $template);
}
function tem_top_sub_names() {
}
function tem_top_sub_names() {