2 files changed, 32 insertions, 10 deletions
diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php
index 49f0c1d749..ccfeb10deb 100644
--- a/tests/functional/posting_test.php
+++ b/tests/functional/posting_test.php
@@ -180,4 +180,26 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 		$crawler = self::submit($form);
 		$this->assertEquals($text, $crawler->filter('#message')->text());
 	}
+
+	public function test_old_signature_in_preview()
+	{
+		$sql = 'UPDATE ' . USERS_TABLE . "
+			SET user_sig = '[b:2u8sdcwb]My signature[/b:2u8sdcwb]',
+				user_sig_bbcode_uid = '2u8sdcwb',
+				user_sig_bbcode_bitfield = 'QA=='
+			WHERE user_id = 2";
+		$this->get_db()->sql_query($sql);
+
+		$this->login();
+		$crawler = self::request('GET', 'posting.php?mode=post&f=2');
+		$form = $crawler->selectButton('Preview')->form(array(
+			'subject' => 'Test subject',
+			'message' => 'My post',
+		));
+		$crawler = self::submit($form);
+		$this->assertContains(
+			'<span style="font-weight: bold">My signature</span>',
+			$crawler->filter('#preview .signature')->html()
+		);
+	}
 }
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 0fec3c2dff..bef1208609 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -863,15 +863,15 @@ class phpbb_functional_test_case extends phpbb_test_case
 	*/
 	static public function assert_response_html($status_code = 200)
 	{
-		if ($status_code !== false)
-		{
-			self::assert_response_status_code($status_code);
-		}
-
 		// Any output before the doc type means there was an error
 		$content = self::$client->getResponse()->getContent();
 		self::assertNotContains('[phpBB Debug]', $content);
 		self::assertStringStartsWith('<!DOCTYPE', trim($content), 'Output found before DOCTYPE specification.');
+
+		if ($status_code !== false)
+		{
+			self::assert_response_status_code($status_code);
+		}
 	}
 
 	/*
@@ -884,15 +884,15 @@ class phpbb_functional_test_case extends phpbb_test_case
 	*/
 	static public function assert_response_xml($status_code = 200)
 	{
-		if ($status_code !== false)
-		{
-			self::assert_response_status_code($status_code);
-		}
-
 		// Any output before the xml opening means there was an error
 		$content = self::$client->getResponse()->getContent();
 		self::assertNotContains('[phpBB Debug]', $content);
 		self::assertStringStartsWith('<?xml', trim($content), 'Output found before XML specification.');
+
+		if ($status_code !== false)
+		{
+			self::assert_response_status_code($status_code);
+		}
 	}
 
 	/**