aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
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 /phpBB/includes
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 'phpBB/includes')
-rw-r--r--phpBB/includes/ucp/ucp_pm_compose.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 06baa279a5..87a8c91fd2 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -999,7 +999,10 @@ function compose_pm($id, $mode, $action, $user_folders = array())
{
$quote_attributes['post_id'] = $post['msg_id'];
}
-
+ if ($action === 'quote')
+ {
+ $quote_attributes['msg_id'] = $post['msg_id'];
+ }
/** @var \phpbb\language\language $language */
$language = $phpbb_container->get('language');
/** @var \phpbb\textformatter\utils_interface $text_formatter_utils */