aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-01 17:49:28 -0800
committerfriendica <info@friendica.com>2014-03-01 17:49:28 -0800
commit247cb85c94c0214c6d60158e0429931a2f8479a0 (patch)
tree97b30418aa0c6c97c293499e8da0582310357aa1
parentc402f39cf869329835fb24dac5613629278a2713 (diff)
downloadvolse-hubzilla-247cb85c94c0214c6d60158e0429931a2f8479a0.tar.gz
volse-hubzilla-247cb85c94c0214c6d60158e0429931a2f8479a0.tar.bz2
volse-hubzilla-247cb85c94c0214c6d60158e0429931a2f8479a0.zip
it's unfortunate that we use the term "layout" to refer both to a template file and to Comanche .PDL files. I think we should probably refer to the template file as "template" just to avoid confusion. For the moment we'll provide both, since the 'layout' is already in the wild. But please use "template" going forward.
-rw-r--r--include/comanche.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/comanche.php b/include/comanche.php
index 0c81b0ed3..3cf5e72a5 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -57,6 +57,10 @@ function comanche_parser(&$a,$s) {
if($cnt)
$a->page['template'] = trim($matches[1]);
+ $cnt = preg_match("/\[template\](.*?)\[\/template\]/ism", $s, $matches);
+ if($cnt)
+ $a->page['template'] = trim($matches[1]);
+
$cnt = preg_match("/\[theme=(.*?)\](.*?)\[\/theme\]/ism", $s, $matches);
if($cnt) {