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/editblock.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/editblock.php')
| -rw-r--r-- | mod/editblock.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mod/editblock.php b/mod/editblock.php index 21d7cc537..818dc5ec7 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -108,12 +108,6 @@ function editblock_content(&$a) { else $mimeselect = mimetype_select($itm[0]['uid'],$mimetype); - $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( - '$title' => t('Edit Block'), - '$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(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), @@ -133,7 +127,7 @@ function editblock_content(&$a) { $rp = 'blocks/' . $channel['channel_address']; - $o .= replace_macros($tpl,array( + $editor = replace_macros($tpl,array( '$return_path' => $rp, '$action' => 'item', '$webpage' => ITEM_TYPE_BLOCK, @@ -181,6 +175,13 @@ function editblock_content(&$a) { '$expires' => t('Set expiration date'), )); + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + '$title' => t('Edit Block'), + '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), + '$id' => $itm[0]['id'], + '$editor' => $editor + )); + return $o; } |