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/editpost.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/editpost.php')
-rw-r--r-- | mod/editpost.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/mod/editpost.php b/mod/editpost.php index 81bb91b2a..e907a07d0 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -38,11 +38,6 @@ function editpost_content(&$a) { $channel = $a->get_channel(); - $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( - '$title' => t('Edit post') - )); - - $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( '$baseurl' => $a->get_baseurl(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), @@ -53,8 +48,6 @@ function editpost_content(&$a) { '$confirmdelete' => t('Delete item?'), )); - - if($itm[0]['item_flags'] & ITEM_OBSCURED) { $key = get_config('system','prvkey'); if($itm[0]['title']) @@ -107,7 +100,7 @@ function editpost_content(&$a) { $cipher = 'aes256'; - $o .= replace_macros($tpl,array( + $editor = replace_macros($tpl,array( '$return_path' => $_SESSION['return_url'], '$action' => 'item', '$share' => t('Edit'), @@ -161,6 +154,11 @@ function editpost_content(&$a) { '$expiryModalCANCEL' => t('Cancel'), )); + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + '$title' => t('Edit post'), + '$editor' => $editor + )); + return $o; } |