diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-11-12 08:46:09 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-11-12 08:46:09 +0100 |
| commit | 87446452f5659d19bd5ae38ac9e90f641f2729a6 (patch) | |
| tree | bfbef898bea00b61a5ba1f48713acbc157ab4df6 | |
| parent | 6806c20bce1eedeee6daafe466e2801c7508fcad (diff) | |
| parent | 13133b359bfce9c6f303faa00cb22171620c1d20 (diff) | |
| download | forums-87446452f5659d19bd5ae38ac9e90f641f2729a6.tar forums-87446452f5659d19bd5ae38ac9e90f641f2729a6.tar.gz forums-87446452f5659d19bd5ae38ac9e90f641f2729a6.tar.bz2 forums-87446452f5659d19bd5ae38ac9e90f641f2729a6.tar.xz forums-87446452f5659d19bd5ae38ac9e90f641f2729a6.zip | |
Merge branch '3.1.x'
| -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 b2928d5df8..a54770812e 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1596,7 +1596,7 @@ function get_folder_status($folder_id, $folder) 'percent' => ($user->data['message_limit']) ? (($user->data['message_limit'] > 0) ? floor(($folder['num_messages'] / $user->data['message_limit']) * 100) : 100) : 0, ); - $return['message'] = $user->lang('FOLDER_STATUS_MSG', $user->lang('MESSAGES_COUNT', (int) $return['max']), $return['cur'], $return['percent']); + $return['message'] = $user->lang('FOLDER_STATUS_MSG', $user->lang('MESSAGES_COUNT', (int) $return['max']), (int) $return['cur'], $return['percent']); return $return; } |