From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 6 Feb 2012 08:58:57 +0000 (+0100)
Subject: fixes CS
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=0150fdf8db17be3cb77e978f3664bea4a618884f;p=web%2Fkonrad%2Ftwig.git

fixes CS
---

diff --git a/lib/Twig/Extension/Core.php b/lib/Twig/Extension/Core.php
index 9c5f9c2..6225557 100644
--- a/lib/Twig/Extension/Core.php
+++ b/lib/Twig/Extension/Core.php
@@ -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);
 }
 
 /**