This commit is contained in:
Fabien Potencier
2012-02-06 09:58:57 +01:00
parent 41927410d9
commit 0150fdf8db
+2 -10
View File
@@ -550,18 +550,10 @@ function twig_slice(Twig_Environment $env, $item, $start, $length = null)
$item = (string) $item;
if (function_exists('mb_get_info') && null !== $charset = $env->getCharset()) {
if (null === $length) {
$length = mb_strlen($item, $charset) - $start;
}
return mb_substr($item, $start, $length, $charset);
}
if (null === $length) {
return substr($item, $start);
return mb_substr($item, $start, null === $length ? mb_strlen($item, $charset) - $start : $length, $charset);
}
return substr($item, $start, $length);
return null === $length ? substr($item, $start) : substr($item, $start, $length);
}
/**