diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-06-05 01:58:52 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-06-05 01:58:52 +0200 |
| commit | a30ec6e052f0566ce3ae0076aeb2eb251bc3c3fe (patch) | |
| tree | b8d16b0cf52e8379aa1518f67a5107d8d3883148 /phpBB/includes/ucp/ucp_pm.php | |
| parent | c504888f037aaff9e202c765e7eb43a6b6abeb25 (diff) | |
| parent | 27e1f1319f17277e29e7e14fbf623e81bb0289f2 (diff) | |
| download | forums-a30ec6e052f0566ce3ae0076aeb2eb251bc3c3fe.tar forums-a30ec6e052f0566ce3ae0076aeb2eb251bc3c3fe.tar.gz forums-a30ec6e052f0566ce3ae0076aeb2eb251bc3c3fe.tar.bz2 forums-a30ec6e052f0566ce3ae0076aeb2eb251bc3c3fe.tar.xz forums-a30ec6e052f0566ce3ae0076aeb2eb251bc3c3fe.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10158] Remove some code duplication from generating the message.
[ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
[ticket/10158] Only view "Return to" links if they are useful.
[ticket/10158] Add return-link to folder, when the user replied from a folder.
[ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php index 84fa9b18dc..87d51ca613 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; |