Fixed slice filter w/ null length for string values

diff --git a/lib/Twig/Extension/Core.php b/lib/Twig/Extension/Core.php
index 829eb43..9c5f9c2 100644 (file)
--- a/lib/Twig/Extension/Core.php
+++ b/lib/Twig/Extension/Core.php
@@ -550,8 +550,16 @@ 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 substr($item, $start, $length);
 }