aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-07-10 12:46:20 +0200
committerMario Vavti <mario@mariovavti.com>2015-07-10 12:46:20 +0200
commit1554b5a2eea889284ed2e13111d72029dfc96963 (patch)
tree58b4f1d0dc729653ca9f7c65f3f53ab63bc61f77 /mod
parent7eb614c8aafc2f830479e1026e6a4924bda657cb (diff)
downloadvolse-hubzilla-1554b5a2eea889284ed2e13111d72029dfc96963.tar.gz
volse-hubzilla-1554b5a2eea889284ed2e13111d72029dfc96963.tar.bz2
volse-hubzilla-1554b5a2eea889284ed2e13111d72029dfc96963.zip
add generic content wrapper to post/webpage editor and make editpost render correctly
Diffstat (limited to 'mod')
-rw-r--r--mod/editpost.php14
1 files changed, 6 insertions, 8 deletions
diff --git a/mod/editpost.php b/mod/editpost.php
index 81bb91b2a..db0a86df1 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;
}