Skip to content

Commit

Permalink
oops: Fix bad merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Jared Hancock committed Mar 10, 2015
1 parent dd0bcf1 commit 3e2f729
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion include/class.api.php
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ function fixup($current) {
# for the database. Otherwise, assume utf-8
list($param,$charset) = explode('=', $extra);
if ($param == 'charset' && $charset)
$contents = Format::utf8encode($contents, $charset);
$contents = Charset::utf8($contents, $charset);
}
}
unset($value);
Expand Down

0 comments on commit 3e2f729

Please sign in to comment.