diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-10 14:20:38 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-10 14:20:38 -0700 |
| commit | 4bf7e4a34d166a52a10939ab0bb26ac05652f59c (patch) | |
| tree | 2324fd2c13717a3d2fb7fe0b0d7de8eb1e268d37 /mod/editlayout.php | |
| parent | ae6541cf74a0940131d6fdb937539effe5b27e3e (diff) | |
| parent | 6e30ccdd2210c1a3e8f4ff571110b9bbae895dc1 (diff) | |
| download | volse-hubzilla-4bf7e4a34d166a52a10939ab0bb26ac05652f59c.tar.gz volse-hubzilla-4bf7e4a34d166a52a10939ab0bb26ac05652f59c.tar.bz2 volse-hubzilla-4bf7e4a34d166a52a10939ab0bb26ac05652f59c.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
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 8ab5aab22..a39611a58 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_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; } |