diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-06-05 01:58:37 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-06-05 01:58:37 +0200 |
| commit | 27e1f1319f17277e29e7e14fbf623e81bb0289f2 (patch) | |
| tree | 7bcb9b4a11df14db3d383f16ac28d5c331a969fb /phpBB/includes/ucp/ucp_pm.php | |
| parent | b1ae6f6407e300bf9948072f109057e40f967289 (diff) | |
| parent | 6b6705b852bcd2a86735fa99d00a77426bf12813 (diff) | |
| download | forums-27e1f1319f17277e29e7e14fbf623e81bb0289f2.tar forums-27e1f1319f17277e29e7e14fbf623e81bb0289f2.tar.gz forums-27e1f1319f17277e29e7e14fbf623e81bb0289f2.tar.bz2 forums-27e1f1319f17277e29e7e14fbf623e81bb0289f2.tar.xz forums-27e1f1319f17277e29e7e14fbf623e81bb0289f2.zip | |
Merge branch 'ticket/nickvergessen/10158' into develop-olympus
* ticket/nickvergessen/10158:
[ticket/10158] Remove some code duplication from generating the message.
[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 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; |