Merge branch '2.4'

* 2.4:
  Explicitly define the encoding.
This commit is contained in:
Fabien Potencier 2014-05-14 23:48:41 +02:00
commit c0187c1465
2 changed files with 6 additions and 7 deletions

View File

@ -1137,7 +1137,7 @@ class Application
$line = '';
foreach (preg_split('//u', $utf8String) as $char) {
// test if $char could be appended to current line
if (mb_strwidth($line.$char) <= $width) {
if (mb_strwidth($line.$char, 'utf8') <= $width) {
$line .= $char;
continue;
}

View File

@ -1,11 +1,10 @@
[Exception]
コマンドの実行中に
エラーが発生しまし
た。
[Exception]
コマンドの実行中にエラーが
発生しました。
foo