소스 검색

fixed previous merge, done the same change to other occurences

Fabien Potencier 13 년 전
부모
커밋
e0502b1d69
2개의 변경된 파일15개의 추가작업 그리고 4개의 파일을 삭제
  1. 6 3
      src/Symfony/Component/Console/Application.php
  2. 9 1
      src/Symfony/Component/Console/Helper/FormatterHelper.php

+ 6 - 3
src/Symfony/Component/Console/Application.php

@@ -718,13 +718,16 @@ class Application
      */
      */
     public function renderException($e, $output)
     public function renderException($e, $output)
     {
     {
-        $strlen = function ($string)
-        {
+        $strlen = function ($string) {
+            if (!function_exists('mb_strlen')) {
+                return strlen($string);
+            }
+
             if (false === $encoding = mb_detect_encoding($string)) {
             if (false === $encoding = mb_detect_encoding($string)) {
                 return strlen($string);
                 return strlen($string);
             }
             }
 
 
-            return function_exists('mb_strlen') ? mb_strlen($string, $encoding) : strlen($string);
+            return mb_strlen($string, $encoding);
         };
         };
 
 
         do {
         do {

+ 9 - 1
src/Symfony/Component/Console/Helper/FormatterHelper.php

@@ -74,7 +74,15 @@ class FormatterHelper extends Helper
      */
      */
     private function strlen($string)
     private function strlen($string)
     {
     {
-        return function_exists('mb_strlen') ? mb_strlen($string, mb_detect_encoding($string)) : strlen($string);
+        if (!function_exists('mb_strlen')) {
+            return strlen($string);
+        }
+
+        if (false === $encoding = mb_detect_encoding($string)) {
+            return strlen($string);
+        }
+
+        return mb_strlen($string, $encoding);
     }
     }
 
 
     /**
     /**