diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-07-29 22:04:07 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-07-29 22:04:07 +0200 |
| commit | 98fa996b3f5125b60e2653bca2218b08041ad6a4 (patch) | |
| tree | 685c3909ac49f7a25cd39877f74ed56ada9b15e0 /mod/editpost.php | |
| parent | 07e890a79a5c506b2e32272edf86ad4aba3b8fba (diff) | |
| parent | cbb6d37b6ca7e5d9e476fd3e7bea3ba56d3271e1 (diff) | |
| download | volse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.tar.gz volse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.tar.bz2 volse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.zip | |
Merge remote-tracking branch 'upstream/master'
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 8e4b37103..235ae9def 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(intval($itm[0]['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; } |