From e2835d66cd630798458993e27e8ff2ea5eb6bfe8 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Sun, 16 Mar 2014 17:54:58 +0100
Subject: [PATCH 1/2] [ticket/10590] Remove confirmation page after posting

PHPBB3-10590
---
 phpBB/posting.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/phpBB/posting.php b/phpBB/posting.php
index 442e1d9782..aee9ba50af 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1213,17 +1213,11 @@ if ($submit || $preview || $refresh)
 				meta_refresh(10, $redirect_url);
 				$message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD'];
 				$message .= (($user->data['user_id'] == ANONYMOUS) ? '' : ' '. $user->lang['POST_APPROVAL_NOTIFY']);
-			}
-			else
-			{
-				meta_refresh(3, $redirect_url);
-
-				$message = ($mode == 'edit') ? 'POST_EDITED' : 'POST_STORED';
-				$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['VIEW_MESSAGE'], '<a href="' . $redirect_url . '">', '</a>');
+				$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $data['forum_id']) . '">', '</a>');
+				trigger_error($message);
 			}
 
-			$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $data['forum_id']) . '">', '</a>');
-			trigger_error($message);
+			redirect($redirect_url);
 		}
 	}
 }

From f0d9a008d33d7a420c7bd9ad605cbf0a13f310c7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 18 Mar 2014 10:58:26 +0100
Subject: [PATCH 2/2] [ticket/10590] Fix functional tests are post confirm
 message removal

PHPBB3-10590
---
 .../phpbb_functional_test_case.php            | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index d6eb4a632f..c0e58d1104 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -893,9 +893,9 @@ class phpbb_functional_test_case extends phpbb_test_case
 	* @param string $message
 	* @param array $additional_form_data Any additional form data to be sent in the request
 	* @param string $expected Lang var of expected message after posting
-	* @return array|null post_id, topic_id if message is 'POST_STORED'
+	* @return array|null post_id, topic_id if message is empty
 	*/
-	public function create_topic($forum_id, $subject, $message, $additional_form_data = array(), $expected = 'POST_STORED')
+	public function create_topic($forum_id, $subject, $message, $additional_form_data = array(), $expected = '')
 	{
 		$posting_url = "posting.php?mode=post&f={$forum_id}&sid={$this->sid}";
 
@@ -919,9 +919,9 @@ class phpbb_functional_test_case extends phpbb_test_case
 	* @param string $message
 	* @param array $additional_form_data Any additional form data to be sent in the request
 	* @param string $expected Lang var of expected message after posting
-	* @return array|null post_id, topic_id if message is 'POST_STORED'
+	* @return array|null post_id, topic_id if message is empty
 	*/
-	public function create_post($forum_id, $topic_id, $subject, $message, $additional_form_data = array(), $expected = 'POST_STORED')
+	public function create_post($forum_id, $topic_id, $subject, $message, $additional_form_data = array(), $expected = '')
 	{
 		$posting_url = "posting.php?mode=reply&f={$forum_id}&t={$topic_id}&sid={$this->sid}";
 
@@ -941,9 +941,9 @@ class phpbb_functional_test_case extends phpbb_test_case
 	* @param string $posting_contains
 	* @param array $form_data
 	* @param string $expected Lang var of expected message after posting
-	* @return array|null post_id, topic_id if message is 'POST_STORED'
+	* @return array|null post_id, topic_id if message is empty
 	*/
-	protected function submit_post($posting_url, $posting_contains, $form_data, $expected = 'POST_STORED')
+	protected function submit_post($posting_url, $posting_contains, $form_data, $expected = '')
 	{
 		$this->add_lang('posting');
 
@@ -989,13 +989,13 @@ class phpbb_functional_test_case extends phpbb_test_case
 		// contained in one of the actual form fields that the browser sees (i.e. it ignores "hidden" inputs)
 		// Instead, I send it as a request with the submit button "post" set to true.
 		$crawler = self::request('POST', $posting_url, $form_data);
-		$this->assertContainsLang($expected, $crawler->filter('html')->text());
 
-		if ($expected !== 'POST_STORED')
+		if ($expected !== '')
 		{
-			return;
+			$this->assertContainsLang($expected, $crawler->filter('html')->text());
+			return null;
 		}
-		$url = $crawler->selectLink($this->lang('VIEW_MESSAGE', '', ''))->link()->getUri();
+		$url = $crawler->selectLink($form_data['subject'])->link()->getUri();
 
 		return array(
 			'topic_id'	=> $this->get_parameter_from_link($url, 't'),