Skip to content

Commit

Permalink
Merge pull request typecho#427 from ldsink/typo
Browse files Browse the repository at this point in the history
修复 iconv 函数参数传递错误
  • Loading branch information
joyqi committed Jan 26, 2016
2 parents 86ae20b + 32249ab commit 55dff63
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion var/Typecho/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ public function getPathInfo($inputEncoding = NULL, $outputEncoding = NULL)
if (function_exists('mb_convert_encoding')) {
$pathInfo = mb_convert_encoding($pathInfo, $outputEncoding, $inputEncoding);
} else if (function_exists('iconv')) {
$pathInfo = iconv($pathInfoEncoding, $outputEncoding, $pathInfo);
$pathInfo = iconv($inputEncoding, $outputEncoding, $pathInfo);
}
}
} else {
Expand Down

0 comments on commit 55dff63

Please sign in to comment.