diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-04 21:07:32 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-04 21:07:32 +0100 |
| commit | 24b02ad4d60c24642559ae8d212bd3d42a5efd0f (patch) | |
| tree | 3bd2d49a1c9d84ca267ac29e8fae3e3477290c03 /phpBB/includes/functions_privmsgs.php | |
| parent | cae30929ea2f6563276e99add58261b05877e574 (diff) | |
| parent | 29b1b95226574bc2b47723d9445ad2ac7a437e99 (diff) | |
| download | forums-24b02ad4d60c24642559ae8d212bd3d42a5efd0f.tar forums-24b02ad4d60c24642559ae8d212bd3d42a5efd0f.tar.gz forums-24b02ad4d60c24642559ae8d212bd3d42a5efd0f.tar.bz2 forums-24b02ad4d60c24642559ae8d212bd3d42a5efd0f.tar.xz forums-24b02ad4d60c24642559ae8d212bd3d42a5efd0f.zip | |
Merge pull request #4443 from Crizz0/ticket/14780
[ticket/14780] Correction to let group setting overwrite global PM setting
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index a54d753787..ff962075a8 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -2158,7 +2158,7 @@ function phpbb_get_max_setting_from_group(\phpbb\db\driver\driver_interface $db, } // Get maximum number of allowed recipients - $sql = 'SELECT MIN(g.group_' . $setting . ') as min_setting, MAX(g.group_' . $setting . ') as max_setting + $sql = 'SELECT MAX(g.group_' . $setting . ') as max_setting FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug WHERE ug.user_id = ' . (int) $user_id . ' AND ug.user_pending = 0 @@ -2167,9 +2167,8 @@ function phpbb_get_max_setting_from_group(\phpbb\db\driver\driver_interface $db, $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); $max_setting = (int) $row['max_setting']; - $min_setting = (int) $row['min_setting']; - return ($min_setting > 0) ? $max_setting : 0; + return $max_setting; } /** |