diff options
| author | Crizzo <mail@crizzo.de> | 2016-09-12 21:17:58 +0200 |
|---|---|---|
| committer | Crizzo <mail@crizzo.de> | 2016-09-12 21:17:58 +0200 |
| commit | b9761f116dd6a656f764883267dea0ef293fc18c (patch) | |
| tree | 938e915dd671da8a734f2ea17c1c68054acfd551 /phpBB/includes | |
| parent | 1a187e0607aeb23dc7f95fec0e3163898c2375f4 (diff) | |
| download | forums-b9761f116dd6a656f764883267dea0ef293fc18c.tar forums-b9761f116dd6a656f764883267dea0ef293fc18c.tar.gz forums-b9761f116dd6a656f764883267dea0ef293fc18c.tar.bz2 forums-b9761f116dd6a656f764883267dea0ef293fc18c.tar.xz forums-b9761f116dd6a656f764883267dea0ef293fc18c.zip | |
[ticket/14780] Correct if sentence to let group setting overwrite global
PHPBB3-14780
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 69c3dad9e6..a614bd0cca 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -2162,7 +2162,7 @@ function phpbb_get_max_setting_from_group(\phpbb\db\driver\driver_interface $db, $max_setting = (int) $row['max_setting']; $min_setting = (int) $row['min_setting']; - return ($min_setting > 0) ? $max_setting : 0; + return ($min_setting > 0) ? $min_setting : $max_setting; } /** |