Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
wfpl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c70f6a
)
added: tem_merge(), tem_merge_file()
author
Jason Woofenden
<jason@jasonwoof.com>
Fri, 6 Nov 2009 11:20:19 +0000
(06:20 -0500)
committer
Jason Woofenden
<jason@jasonwoof.com>
Fri, 20 Nov 2009 00:02:49 +0000
(19:02 -0500)
template.php
patch
|
blob
|
history
diff --git
a/template.php
b/template.php
index
45857af
..
af66590
100644
(file)
--- a/
template.php
+++ b/
template.php
@@
-445,6
+445,13
@@
class tem {
$this->template = merge_templates($this->template, $tem->template);
}
$this->template = merge_templates($this->template, $tem->template);
}
+ # see merge() above
+ function merge_file($filename) {
+ $other_tem = new tem();
+ $other_tem->load($filename);
+ $this->merge($other_tem);
+ }
+
function top_sub_names($is_sub = 'is_sub_template') {
return array_keys(top_sub_templates($this->template, $is_sub));
}
function top_sub_names($is_sub = 'is_sub_template') {
return array_keys(top_sub_templates($this->template, $is_sub));
}
@@
-510,6
+517,16
@@
function tem_load($filename) {
$GLOBALS['wfpl_template']->load($filename);
}
$GLOBALS['wfpl_template']->load($filename);
}
+function tem_merge($tem) {
+ tem_init();
+ $GLOBALS['wfpl_template']->merge($tem);
+}
+
+function tem_merge_file($filename) {
+ tem_init();
+ $GLOBALS['wfpl_template']->merge_file($filename);
+}
+
function tem_output($filename = false) {
tem_init();
$GLOBALS['wfpl_template']->output($filename);
function tem_output($filename = false) {
tem_init();
$GLOBALS['wfpl_template']->output($filename);