diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-02 04:07:23 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-02 04:07:23 -0500 |
| commit | f0fdd1a163b6bc7213eeb48c6ee9025087bb0032 (patch) | |
| tree | 2e7855a389313397b310a70b0e6072a5ba6dcce1 /include/template_processor.php | |
| parent | b7ab2a2fc92bbd7ec3a506e18f950579e10719eb (diff) | |
| parent | 90bdddca0d1b2e2128646d1f698b6d514e748001 (diff) | |
| download | volse-hubzilla-f0fdd1a163b6bc7213eeb48c6ee9025087bb0032.tar.gz volse-hubzilla-f0fdd1a163b6bc7213eeb48c6ee9025087bb0032.tar.bz2 volse-hubzilla-f0fdd1a163b6bc7213eeb48c6ee9025087bb0032.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
item table update for file feature
probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
diabook commit
conversation: remove templating items in code and move it to template.
Enabled automated doc building. Changes: -build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them
template proc: avoid a notice and allow template name to include to be passed with a variable value
show relation in contact_template
admin: fix small string
fix visualization in groupeditor
less html in mod/group.php, template for group members editor, quattro theme for group edit.
* master:
Diffstat (limited to 'include/template_processor.php')
| -rwxr-xr-x | include/template_processor.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/template_processor.php b/include/template_processor.php index 28c3f07dd..b4d444e1c 100755 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -116,7 +116,15 @@ * {{ inc <templatefile> [with $var1=$var2] }}{{ endinc }} */ private function _replcb_inc($args){ - list($tplfile, $newctx) = array_map('trim', explode("with",$args[2])); + if (strpos($args[2],"with")) { + list($tplfile, $newctx) = array_map('trim', explode("with",$args[2])); + } else { + $tplfile = trim($args[2]); + $newctx = null; + } + + if ($tplfile[0]=="$") $tplfile = $this->_get_var($tplfile); + $this->_push_stack(); $r = $this->r; if (!is_null($newctx)) { |