diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 20:34:39 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 20:34:39 +0100 |
| commit | 0a5d2a84d158e23b1d2e724d569c183bb049892e (patch) | |
| tree | 46ae1beb9d5b22e0dc0583e35458bdd463dc27ba /phpBB/includes/ucp/ucp_pm.php | |
| parent | 0579795a173db538ce4aeb9b3ce09e55581e9f87 (diff) | |
| parent | 2b3effb13c0f1d8322653147e5dcbc20ae36b418 (diff) | |
| download | forums-0a5d2a84d158e23b1d2e724d569c183bb049892e.tar forums-0a5d2a84d158e23b1d2e724d569c183bb049892e.tar.gz forums-0a5d2a84d158e23b1d2e724d569c183bb049892e.tar.bz2 forums-0a5d2a84d158e23b1d2e724d569c183bb049892e.tar.xz forums-0a5d2a84d158e23b1d2e724d569c183bb049892e.zip | |
Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympus
* igorw/ticket/8616:
[ticket/8616] Include old U_INBOX var for BC
[ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE
[ticket/8616] Direct links in pm notification emails
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php index c675928a5b..447b6ebe87 100644 --- a/phpBB/includes/ucp/ucp_pm.php +++ b/phpBB/includes/ucp/ucp_pm.php @@ -243,7 +243,7 @@ class ucp_pm $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']; |