diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-10 14:27:41 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-10 14:27:41 -0700 |
| commit | a497d8ee66edcb6e0c29e8e16c875963d497334d (patch) | |
| tree | e48292679f625212dd76d4fa98b4cde9c7d5e440 /mod/editblock.php | |
| parent | 43354ab385cd5c7adcc86f591159f10201420aae (diff) | |
| parent | 4bf7e4a34d166a52a10939ab0bb26ac05652f59c (diff) | |
| download | volse-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/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; } |