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/editpost.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/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; } |