resolved conflicts.

This commit is contained in:
Taylor Otwell
2011-10-11 21:28:06 -05:00
2 changed files with 52 additions and 1 deletions

View File

@@ -118,7 +118,7 @@ class Str {
if (function_exists('mb_substr'))
{
return mb_substr($value, 0, $length).$end;
return mb_substr($value, 0, $length, Config::get('application.encoding')).$end;
}
return substr($value, 0, $length).$end;