Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/zendframework/zendframework#6093-dead-code-clean…
Browse files Browse the repository at this point in the history
  • Loading branch information
Ocramius committed Apr 8, 2014
2 parents 17142c6 + 3d97fe1 commit 6f81161
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/Escaper.php
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@ protected function isUtf8($string)
*/
protected function convertEncoding($string, $to, $from)
{
$result = '';
if (function_exists('iconv')) {
$result = iconv($from, $to, $string);
} elseif (function_exists('mb_convert_encoding')) {
Expand Down

0 comments on commit 6f81161

Please sign in to comment.