aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-11-12 08:46:05 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-11-12 08:46:05 +0100
commit13133b359bfce9c6f303faa00cb22171620c1d20 (patch)
tree766cf291c4ee1ae53ebcab630d434504433f2e29 /phpBB/includes
parent1c1fe43e166b17e879bf73f165299181d9d05cc4 (diff)
parent865c16cf26361a942797d214d604f4fbb6031626 (diff)
downloadforums-13133b359bfce9c6f303faa00cb22171620c1d20.tar
forums-13133b359bfce9c6f303faa00cb22171620c1d20.tar.gz
forums-13133b359bfce9c6f303faa00cb22171620c1d20.tar.bz2
forums-13133b359bfce9c6f303faa00cb22171620c1d20.tar.xz
forums-13133b359bfce9c6f303faa00cb22171620c1d20.zip
Merge pull request #4022 from RMcGirr83/3.1.x
[ticket/14276] Adjust function get_folder_status
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_privmsgs.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 8e1561b842..1639eb1a4c 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1594,7 +1594,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;
}