diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-07-10 20:46:46 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-07-10 20:46:46 +0200 |
| commit | b1f926ba893cadad2a7fdbf14bdccafbfefdbbe6 (patch) | |
| tree | 7ebcbe1278b6e87c5b158d3d0b3ec0ae05919f19 /mod/editlayout.php | |
| parent | 43354ab385cd5c7adcc86f591159f10201420aae (diff) | |
| parent | 071a233fb8aa427ae0637cda1ca0b47631d6b521 (diff) | |
| download | volse-hubzilla-b1f926ba893cadad2a7fdbf14bdccafbfefdbbe6.tar.gz volse-hubzilla-b1f926ba893cadad2a7fdbf14bdccafbfefdbbe6.tar.bz2 volse-hubzilla-b1f926ba893cadad2a7fdbf14bdccafbfefdbbe6.zip | |
merge redmatrix fixes
Diffstat (limited to 'mod/editlayout.php')
| -rw-r--r-- | mod/editlayout.php | 16 |
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; } |