aboutsummaryrefslogtreecommitdiffstats
path: root/mod/editlayout.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-10 14:27:41 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-10 14:27:41 -0700
commita497d8ee66edcb6e0c29e8e16c875963d497334d (patch)
treee48292679f625212dd76d4fa98b4cde9c7d5e440 /mod/editlayout.php
parent43354ab385cd5c7adcc86f591159f10201420aae (diff)
parent4bf7e4a34d166a52a10939ab0bb26ac05652f59c (diff)
downloadvolse-hubzilla-a497d8ee66edcb6e0c29e8e16c875963d497334d.tar.gz
volse-hubzilla-a497d8ee66edcb6e0c29e8e16c875963d497334d.tar.bz2
volse-hubzilla-a497d8ee66edcb6e0c29e8e16c875963d497334d.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php
Diffstat (limited to 'mod/editlayout.php')
-rw-r--r--mod/editlayout.php16
1 files changed, 9 insertions, 7 deletions
diff --git a/mod/editlayout.php b/mod/editlayout.php
index d61a14a48..6ea7f4100 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -101,12 +101,6 @@ function editlayout_content(&$a) {
$layout_title = $item_id[0]['sid'];
$plaintext = true;
-
- $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
- '$title' => t('Edit Layout'),
- '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
- '$id' => $itm[0]['id']
- ));
$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
'$baseurl' => $a->get_baseurl(),
@@ -132,7 +126,7 @@ function editlayout_content(&$a) {
$rp = 'layouts/' . $which;
- $o .= replace_macros($tpl,array(
+ $editor = replace_macros($tpl,array(
'$return_path' => $rp,
'$action' => 'item',
'$webpage' => ITEM_TYPE_PDL,
@@ -178,6 +172,14 @@ function editlayout_content(&$a) {
'$expires' => t('Set expiration date'),
));
+
+ $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+ '$title' => t('Edit Layout'),
+ '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+ '$id' => $itm[0]['id'],
+ '$editor' => $editor
+ ));
+
return $o;
}