aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-12-06 07:03:35 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-12-06 07:03:35 +0100
commit186384e514d85a9603be7178a8d82d55fd4925aa (patch)
treead1446a07c3a89cb4ce2ef5d5de1ce8ecdd73eef /tests
parentf9a364074d707b08bec00a7e25408d3a1094ec10 (diff)
parent41918b8afa031806b36dd20b6ee44a915033b8df (diff)
downloadforums-186384e514d85a9603be7178a8d82d55fd4925aa.tar
forums-186384e514d85a9603be7178a8d82d55fd4925aa.tar.gz
forums-186384e514d85a9603be7178a8d82d55fd4925aa.tar.bz2
forums-186384e514d85a9603be7178a8d82d55fd4925aa.tar.xz
forums-186384e514d85a9603be7178a8d82d55fd4925aa.zip
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'tests')
-rw-r--r--tests/functional/private_messages_test.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/functional/private_messages_test.php b/tests/functional/private_messages_test.php
index 7fda26fb49..ce709524a9 100644
--- a/tests/functional/private_messages_test.php
+++ b/tests/functional/private_messages_test.php
@@ -85,7 +85,7 @@ class phpbb_functional_private_messages_test extends phpbb_functional_test_case
public function test_quote_pm()
{
$text = 'This is a test private message sent by the testing framework.';
- $expected = "(\\[quote=admin time=\\d+ user_id=2\\]\n" . $text . "\n\\[/quote\\])";
+ $expected = "(\\[quote=admin msg_id=\\d+ time=\\d+ user_id=2\\]\n" . $text . "\n\\[/quote\\])";
$this->login();
$message_id = $this->create_private_message('Test', $text, array(2));