diff options
| author | friendica <info@friendica.com> | 2012-03-02 00:10:05 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-03-02 00:10:05 -0800 |
| commit | 90bdddca0d1b2e2128646d1f698b6d514e748001 (patch) | |
| tree | 2e7855a389313397b310a70b0e6072a5ba6dcce1 /include/template_processor.php | |
| parent | be231e346658eb68e518324ba995aaccb7abd055 (diff) | |
| parent | 3a609adfb77a94d5b8681496a9306d9cf4efcafb (diff) | |
| download | volse-hubzilla-90bdddca0d1b2e2128646d1f698b6d514e748001.tar.gz volse-hubzilla-90bdddca0d1b2e2128646d1f698b6d514e748001.tar.bz2 volse-hubzilla-90bdddca0d1b2e2128646d1f698b6d514e748001.zip | |
Merge branch 'pull'
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)) { |