diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 20:34:53 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 20:34:53 +0100 |
| commit | 1b003fd244a9377731f118b62850861210d0a9b0 (patch) | |
| tree | ff313a530379df6d623604af1b2d39975cdeb16c /phpBB/includes/ucp/ucp_pm.php | |
| parent | d3a1b670bd555c33ccbea4c7f58ac404e294381b (diff) | |
| parent | 0a5d2a84d158e23b1d2e724d569c183bb049892e (diff) | |
| download | forums-1b003fd244a9377731f118b62850861210d0a9b0.tar forums-1b003fd244a9377731f118b62850861210d0a9b0.tar.gz forums-1b003fd244a9377731f118b62850861210d0a9b0.tar.bz2 forums-1b003fd244a9377731f118b62850861210d0a9b0.tar.xz forums-1b003fd244a9377731f118b62850861210d0a9b0.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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 87d51ca613..0691f3158c 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']; |