From 3bea610e1282410d60342fbd1ca64c6dbf7ccb21 Mon Sep 17 00:00:00 2001 From: Arjen van der Meijden Date: Tue, 17 Jan 2017 08:25:19 +0100 Subject: [PATCH] Use null rather than specific length for 'all characters to the end' with mb_substr --- lib/Twig/Extension/Core.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Twig/Extension/Core.php b/lib/Twig/Extension/Core.php index cbb6c84c6..dd503eca4 100644 --- a/lib/Twig/Extension/Core.php +++ b/lib/Twig/Extension/Core.php @@ -594,7 +594,7 @@ function twig_slice(Twig_Environment $env, $item, $start, $length = null, $prese $item = (string) $item; - return (string) mb_substr($item, $start, null === $length ? mb_strlen($item, $env->getCharset()) - $start : $length, $env->getCharset()); + return (string) mb_substr($item, $start, $length, $env->getCharset()); } /** @@ -1168,7 +1168,7 @@ function twig_capitalize_string_filter(Twig_Environment $env, $string) { $charset = $env->getCharset(); - return mb_strtoupper(mb_substr($string, 0, 1, $charset), $charset).mb_strtolower(mb_substr($string, 1, 2147483647, $charset), $charset); + return mb_strtoupper(mb_substr($string, 0, 1, $charset), $charset).mb_strtolower(mb_substr($string, 1, null, $charset), $charset); } /**