aboutsummaryrefslogtreecommitdiffstats
path: root/mod/editblock.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-10 14:20:38 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-10 14:20:38 -0700
commit4bf7e4a34d166a52a10939ab0bb26ac05652f59c (patch)
tree2324fd2c13717a3d2fb7fe0b0d7de8eb1e268d37 /mod/editblock.php
parentae6541cf74a0940131d6fdb937539effe5b27e3e (diff)
parent6e30ccdd2210c1a3e8f4ff571110b9bbae895dc1 (diff)
downloadvolse-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/editblock.php')
-rw-r--r--mod/editblock.php15
1 files changed, 8 insertions, 7 deletions
diff --git a/mod/editblock.php b/mod/editblock.php
index a0ece8133..faa283b63 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_BUILDBLOCK,
@@ -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;
}