File: includes/ucp/ucp_pm.php
Unmodified
Added
Modified
Removed
| Line 115 | Line 115 |
|---|
case 'compose':
$action = request_var('action', 'post');
|
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'))
{
|
if (!$auth->acl_get('u_sendpm'))
{
|
| Line 130 | Line 130 |
|---|
}
include($phpbb_root_path . 'includes/ucp/ucp_pm_compose.' . $phpEx);
|
}
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;
|
$tpl_file = 'posting_body';
break;
|
| Line 243 | Line 243 |
|---|
$num_not_moved = $num_removed = 0;
$release = request_var('release', 0);
|
$num_not_moved = $num_removed = 0;
$release = request_var('release', 0);
|
if ($user->data['user_new_privmsg'] && $action == 'view_folder')
| if ($user->data['user_new_privmsg'] && ($action == 'view_folder' || $action == 'view_message'))
|
{
$return = place_pm_into_folder($global_privmsgs_rules, $release);
$num_not_moved = $return['not_moved'];
| {
$return = place_pm_into_folder($global_privmsgs_rules, $release);
$num_not_moved = $return['not_moved'];
|
