add generic content wrapper to post/webpage editor and make editpost render correctly

This commit is contained in:
Mario Vavti
2015-07-10 12:46:20 +02:00
parent 7eb614c8aa
commit 1554b5a2ee
3 changed files with 20 additions and 20 deletions

View File

@@ -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;
}