mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00
Code Issues Releases Wiki Activity

[ticket/10345] Allow float as array key and add some tests

Browse Source 
Added tests for the fallback when a key is missing and the float-feature.

PHPBB3-10345
This commit is contained in:
Joas Schilling
2011-09-20 01:39:21 +02:00
committed by Oleg Pudeyev
parent 179662e949
commit 2de7153afd
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/session.php
View File

@@ -1869,7 +1869,7 @@ class user extends session
// We now get the first number passed and will select the key based upon this number
for ($i = 1, $num_args = sizeof($args); $i < $num_args; $i++)
{
if (is_int($args[$i]))
if (is_int($args[$i]) || is_float($args[$i]))
{
$use_plural_form = $this->get_plural_form($args[$i]);
$numbers = array_keys($lang);
@@ -1905,12 +1905,14 @@ class user extends session
* Determine which plural form we should use.
* For some languages this is not as simple as for English.
*
* @param $number int The number we want to get the plural case for
* @param $number int|float The number we want to get the plural case for
* @param $force_rule mixed False to use the plural rule of the language package
* or an integer to force a certain plural rule
*/
function get_plural_form($number, $force_rule = false)
{
$number = (int) $number;
if ($number == 0)
{
// We use special language strings for 0, so it's "no users" instead of "0 users"