aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2011-05-09 12:46:34 +0200
committerJoas Schilling <nickvergessen@gmx.de>2011-05-09 12:46:34 +0200
commit437013194a516932b6f85ba4ee355dcf5836ef19 (patch)
tree7d3861adc7fe5283bfab4d8370e691d5eac89aff /phpBB/includes/ucp/ucp_pm.php
parent65d956bd81fad62d7bc2f489ea8d3d930e666049 (diff)
downloadforums-437013194a516932b6f85ba4ee355dcf5836ef19.tar
forums-437013194a516932b6f85ba4ee355dcf5836ef19.tar.gz
forums-437013194a516932b6f85ba4ee355dcf5836ef19.tar.bz2
forums-437013194a516932b6f85ba4ee355dcf5836ef19.tar.xz
forums-437013194a516932b6f85ba4ee355dcf5836ef19.zip
[ticket/10158] Add return-link to folder, when the user replied from a folder.
PHPBB3-10158
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php
index e1c51170db..c675928a5b 100644
--- a/phpBB/includes/ucp/ucp_pm.php
+++ b/phpBB/includes/ucp/ucp_pm.php
@@ -115,7 +115,7 @@ class ucp_pm
case 'compose':
$action = request_var('action', 'post');
- get_folder($user->data['user_id']);
+ $user_folders = get_folder($user->data['user_id']);
if (!$auth->acl_get('u_sendpm'))
{
@@ -130,7 +130,7 @@ class ucp_pm
}
include($phpbb_root_path . 'includes/ucp/ucp_pm_compose.' . $phpEx);
- compose_pm($id, $mode, $action);
+ compose_pm($id, $mode, $action, $user_folders);
$tpl_file = 'posting_body';
break;