From db58b6223503a63f92cccddd87179ae8e3ae1e46 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Wed, 9 Sep 2015 19:54:16 -0700
Subject: don't auto-open the editor in forum mode. Save the forum selection
 text until we open it.

---
 mod/editblock.php   | 1 +
 mod/editlayout.php  | 1 +
 mod/editpost.php    | 1 +
 mod/editwebpage.php | 1 +
 mod/network.php     | 2 +-
 5 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'mod')

diff --git a/mod/editblock.php b/mod/editblock.php
index b4d954ef5..9269676b1 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -111,6 +111,7 @@ function editblock_content(&$a) {
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
 		'$baseurl'       => $a->get_baseurl(),
 		'$editselect'    => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+		'$pretext'       => '',
 		'$ispublic'      => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag'        => '',
 		'$nickname'      => $channel['channel_address'],
diff --git a/mod/editlayout.php b/mod/editlayout.php
index 6ea7f4100..fc68cfe3c 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -105,6 +105,7 @@ function editlayout_content(&$a) {
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
 		'$baseurl'       => $a->get_baseurl(),
 		'$editselect'    =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+		'$pretext'       => '',
 		'$ispublic'      => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag'        => $geotag,
 		'$nickname'      => $channel['channel_address'],
diff --git a/mod/editpost.php b/mod/editpost.php
index daca7c154..d4dc35ef8 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -47,6 +47,7 @@ function editpost_content(&$a) {
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
 		'$baseurl' => $a->get_baseurl(),
 		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+		'$pretext' => '',
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
 		'$nickname' => $channel['channel_address'],
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index 974e8cc38..0192fd9c0 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -146,6 +146,7 @@ function editwebpage_content(&$a) {
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
 		'$baseurl' => $a->get_baseurl(),
 		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+		'$pretext'  => '',
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
 		'$nickname' => $channel['channel_address'],
diff --git a/mod/network.php b/mod/network.php
index 3614c81d6..82c68424c 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -172,7 +172,7 @@ function network_content(&$a, $update = 0, $load = false) {
 			'profile_uid'      => local_channel()
 		);
 		if($deftag)
-			$x['body'] = $deftag;
+			$x['pretext'] = $deftag;
 
 		$status_editor = status_editor($a,$x);
 		$o .= $status_editor;
-- 
cgit v1.2.3