Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	mod/editpost.php
	util/messages.po
	view/nl/messages.po
	view/nl/strings.php

1 files changed, 6 insertions, 7 deletions

diff --git a/mod/editpost.php b/mod/editpost.php
index 8e4b37103..b5e9b6e94 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)/'),
@@ -54,7 +49,6 @@ function editpost_content(&$a) {
 	));
 
 
-
 	if(intval($itm[0]['item_obscured'])) {
 		$key = get_config('system','prvkey');
 		if($itm[0]['title'])
@@ -107,7 +101,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 +155,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;
 
 }