diff options
author | Marc Alexander <admin@m-a-styles.de> | 2019-06-17 15:28:10 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2019-06-17 15:28:10 +0200 |
commit | 5cef0d203580a1a6a074e4c27b86d442c18da45e (patch) | |
tree | 609261ef0e5f2ea11cc392f81f2d64e5899ef707 /phpBB/includes | |
parent | 8a979d6871a19bd39d5f85ceaad787314d1eaaa7 (diff) | |
parent | 70f09a60c7732e3793334e3cf7f9e38307bd9edd (diff) | |
download | forums-5cef0d203580a1a6a074e4c27b86d442c18da45e.tar forums-5cef0d203580a1a6a074e4c27b86d442c18da45e.tar.gz forums-5cef0d203580a1a6a074e4c27b86d442c18da45e.tar.bz2 forums-5cef0d203580a1a6a074e4c27b86d442c18da45e.tar.xz forums-5cef0d203580a1a6a074e4c27b86d442c18da45e.zip |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/includes')
-rw-r--r-- | phpBB/includes/functions_privmsgs.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 444bf2c7e0..a7a4b050fe 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -490,7 +490,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false) 'bcc' => explode(':', $row['bcc_address']), 'friend' => (isset($zebra[$row['author_id']])) ? $zebra[$row['author_id']]['friend'] : 0, 'foe' => (isset($zebra[$row['author_id']])) ? $zebra[$row['author_id']]['foe'] : 0, - 'user_in_group' => array($user->data['group_id']), + 'user_in_group' => $user->data['group_id'], 'author_in_group' => array()) ); |