aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-01-31 00:32:39 +0100
committerAndreas Fischer <bantu@phpbb.com>2013-01-31 00:32:39 +0100
commit01045a6bb06e65108097d4e11f10786d5d13aee8 (patch)
treebe0392ec98e7757d4b76a050cf38572ab46fa237 /phpBB/includes
parent67c85fa4d3adce385958762a2f55cd5aaeecc733 (diff)
parenta0b141b6730a8b32e9fb4fe721360e78fb99ae68 (diff)
downloadforums-01045a6bb06e65108097d4e11f10786d5d13aee8.tar
forums-01045a6bb06e65108097d4e11f10786d5d13aee8.tar.gz
forums-01045a6bb06e65108097d4e11f10786d5d13aee8.tar.bz2
forums-01045a6bb06e65108097d4e11f10786d5d13aee8.tar.xz
forums-01045a6bb06e65108097d4e11f10786d5d13aee8.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11233] prohibit selecting anonymous user as a PM recipient
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/ucp/ucp_pm_compose.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 5577e8dab3..c2d12d17c2 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -353,7 +353,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
$message_attachment = 0;
$message_text = $message_subject = '';
- if ($to_user_id && $action == 'post')
+ if ($to_user_id && $to_user_id != ANONYMOUS && $action == 'post')
{
$address_list['u'][$to_user_id] = 'to';
}