From 91b91494e201ee33d06fa86bc608f6f9fc45bdaa Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Wed, 12 Aug 2009 09:25:57 +0000
Subject: [PATCH] #49465

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9960 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/posting.php                                       | 3 ++-
 phpBB/styles/prosilver/template/quickreply_editor.html  | 2 +-
 phpBB/styles/subsilver2/template/quickreply_editor.html | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/phpBB/posting.php b/phpBB/posting.php
index 05fabaca7c..bea534c5dd 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -39,7 +39,7 @@ $load		= (isset($_POST['load'])) ? true : false;
 $delete		= (isset($_POST['delete'])) ? true : false;
 $cancel		= (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false;
 
-$refresh	= (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['cancel_unglobalise']) || $save || $load) ? true : false;
+$refresh	= (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['full_editor']) ||isset($_POST['cancel_unglobalise']) || $save || $load) ? true : false;
 $mode		= ($delete && !$preview && !$refresh && $submit) ? 'delete' : request_var('mode', '');
 
 $error = $post_data = array();
@@ -1365,6 +1365,7 @@ generate_forum_nav($post_data);
 // Build Forum Rules
 generate_forum_rules($post_data);
 
+// Posting uses is_solved for legacy reasons. Plugins have to use is_solved to force themselves to be displayed.
 if ($config['enable_post_confirm'] && !$user->data['is_registered'] && (isset($captcha) && $captcha->is_solved() === false) && ($mode == 'post' || $mode == 'reply' || $mode == 'quote'))
 {
 	$captcha->reset();
diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html
index 10fede984d..cc090957f9 100644
--- a/phpBB/styles/prosilver/template/quickreply_editor.html
+++ b/phpBB/styles/prosilver/template/quickreply_editor.html
@@ -28,7 +28,7 @@
 					{S_FORM_TOKEN}
 					{QR_HIDDEN_FIELDS}
 					<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
-					<input type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" class="button2" />&nbsp;
+					<input type="submit" accesskey="f" tabindex="6" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />&nbsp;
 				</fieldset>
 			</div>
 		<span class="corners-bottom"><span></span></span></div>
diff --git a/phpBB/styles/subsilver2/template/quickreply_editor.html b/phpBB/styles/subsilver2/template/quickreply_editor.html
index f53b03bd62..704c6e1306 100644
--- a/phpBB/styles/subsilver2/template/quickreply_editor.html
+++ b/phpBB/styles/subsilver2/template/quickreply_editor.html
@@ -15,7 +15,7 @@
 		<tr>
 			<td class="cat" colspan="2" align="center">
 				<input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" />&nbsp;
-				<input class="btnlite" type="submit" accesskey="f" tabindex="7" name="preview" value="{L_FULL_EDITOR}" />
+				<input class="btnlite" type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" />
 
 				{S_FORM_TOKEN}
 				{QR_HIDDEN_FIELDS}