diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-30 15:56:02 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-30 15:56:02 +0000 |
| commit | 4b9077a58b26dff7be421f1808b13309ba6da4a8 (patch) | |
| tree | a135fd1bad78e0de2383393aa5483c517674f4a4 | |
| parent | 5e7c936618c51c0c117370714ac99407588db1b2 (diff) | |
| download | forums-4b9077a58b26dff7be421f1808b13309ba6da4a8.tar forums-4b9077a58b26dff7be421f1808b13309ba6da4a8.tar.gz forums-4b9077a58b26dff7be421f1808b13309ba6da4a8.tar.bz2 forums-4b9077a58b26dff7be421f1808b13309ba6da4a8.tar.xz forums-4b9077a58b26dff7be421f1808b13309ba6da4a8.zip | |
merge
git-svn-id: file:///svn/phpbb/trunk@8532 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 9ddd8ff582..2140aacff1 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -152,7 +152,7 @@ class acp_attachments if (in_array($config_name, array('attachment_quota', 'max_filesize', 'max_filesize_pm'))) { $size_var = request_var($config_name, ''); - $this->new_config[$config_name] = $config_value = ($size_var == 'kb') ? ($config_value << 10) : (($size_var == 'mb') ? ($config_value << 20) : $config_value); + $this->new_config[$config_name] = $config_value = ($size_var == 'kb') ? round($config_value * 1024) : (($size_var == 'mb') ? round($config_value * 1048576) : $config_value); } if ($submit) @@ -513,7 +513,7 @@ class acp_attachments $allowed_forums = request_var('allowed_forums', array(0)); $allow_in_pm = (isset($_POST['allow_in_pm'])) ? true : false; $max_filesize = request_var('max_filesize', 0); - $max_filesize = ($size_select == 'kb') ? ($max_filesize << 10) : (($size_select == 'mb') ? ($max_filesize << 20) : $max_filesize); + $max_filesize = ($size_select == 'kb') ? round($max_filesize * 1024) : (($size_select == 'mb') ? round($max_filesize * 1048576) : $max_filesize); $allow_group = (isset($_POST['allow_group'])) ? true : false; if ($max_filesize == $config['max_filesize']) |