Merge pull request splitbrain#11 from hexmode/substr-bug

splitbrain · web-flow · commit ff9e6ec1907b · 2019-06-23T08:40:57.000+02:00
mb_substr() treats $length differently than substr()
diff --git a/src/TableFormatter.php b/src/TableFormatter.php
@@ -273,7 +273,12 @@ protected function substr($string, $start = 0, $length = null)
         if (function_exists('mb_substr')) {
             return mb_substr($string, $start, $length);
         } else {
-            return substr($string, $start, $length);
+            // mb_substr() treats $length differently than substr()
+            if ($length) {
+                return substr($string, $start, $length);
+            } else {
+                return substr($string, $start);
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,12 @@ protected function substr($string, $start = 0, $length = null)`
`273`	`273`	`if (function_exists('mb_substr')) {`
`274`	`274`	`return mb_substr($string, $start, $length);`
`275`	`275`	`} else {`
`276`		`- return substr($string, $start, $length);`
	`276`	`+ // mb_substr() treats $length differently than substr()`
	`277`	`+ if ($length) {`
	`278`	`+ return substr($string, $start, $length);`
	`279`	`+ } else {`
	`280`	`+ return substr($string, $start);`
	`281`	`+ }`
`277`	`282`	`}`
`278`	`283`	`}`
`279`	`284`