aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-01-09 17:41:47 +0100
committerJoas Schilling <nickvergessen@gmx.de>2015-01-09 17:41:47 +0100
commitff44579523f6a6778181dd86459241d9d4fd4294 (patch)
tree993c1cbbb8c90a6aca7f17383af8e9b2e4443ffd
parentb9c10e34bb38a7111712398b92da98bbfe32e486 (diff)
parent67c9f4d064803b214f06fe28ff2d6416a317b601 (diff)
downloadforums-ff44579523f6a6778181dd86459241d9d4fd4294.tar
forums-ff44579523f6a6778181dd86459241d9d4fd4294.tar.gz
forums-ff44579523f6a6778181dd86459241d9d4fd4294.tar.bz2
forums-ff44579523f6a6778181dd86459241d9d4fd4294.tar.xz
forums-ff44579523f6a6778181dd86459241d9d4fd4294.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/includes/acp/acp_email.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index 4671a026eb..fcc2bd7641 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -40,7 +40,7 @@ class acp_email
$error = array();
$usernames = request_var('usernames', '', true);
- $usernames = explode("\n", $usernames);
+ $usernames = (!empty($usernames)) ? explode("\n", $usernames) : array();
$group_id = request_var('g', 0);
$subject = utf8_normalize_nfc(request_var('subject', '', true));
$message = utf8_normalize_nfc(request_var('message', '', true));