aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm.php
diff options
context:
space:
mode:
authorAlan <asinshesq@code.phpbb.com>2011-10-13 19:17:56 +0200
committerIgor Wiedler <igor@wiedler.ch>2011-10-13 19:17:56 +0200
commitf7c1341402ea47cc33ac183421485db3efd7ea15 (patch)
tree1f11a3b44aaa390d2faa221cd21beefeda00db0c /phpBB/includes/ucp/ucp_pm.php
parentb957639abb4eba00b840092e60fffbc36a9db84c (diff)
downloadforums-f7c1341402ea47cc33ac183421485db3efd7ea15.tar
forums-f7c1341402ea47cc33ac183421485db3efd7ea15.tar.gz
forums-f7c1341402ea47cc33ac183421485db3efd7ea15.tar.bz2
forums-f7c1341402ea47cc33ac183421485db3efd7ea15.tar.xz
forums-f7c1341402ea47cc33ac183421485db3efd7ea15.zip
[ticket/8616] Direct links in pm notification emails
Import the "Direct links in pm notification emails" modification, version 1.0.1. PHPBB3-8616
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm.php2
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'];