geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-12 02:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved random function

Browse Source
This commit is contained in:
Tobias Schultze
2012-01-25 13:34:39 +01:00
parent db9179c77d
commit e81a9e2e71
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Extension/Core.php
+5 -3
View File
@@ -299,9 +299,11 @@ function twig_random($values)
$values = iterator_to_array($values);
}
$keys = array_keys($values);
if (0 === count($values)) {
throw new Twig_Error_Runtime('The random function cannot pick from an empty array.');
}
return $values[$keys[mt_rand(0, count($values) - 1)]];
return $values[array_rand($values, 1)];
}
/**
@@ -489,7 +491,7 @@ function _twig_markup2string(&$value)
function twig_array_merge($arr1, $arr2)
{
if (!is_array($arr1) || !is_array($arr2)) {
throw new Twig_Error_Runtime('The merge filter only work with arrays or hashes.');
throw new Twig_Error_Runtime('The merge filter only works with arrays or hashes.');
}
return array_merge($arr1, $arr2);