Browse files

Merge branch 'develop' of github.com:phpDocumentor/phpDocumentor2 int…

…o develop
  • Loading branch information...
2 parents c3a9ff4 + a9c3d2b commit 218f006abc7f05d69aeeaf92c85e168776a1957a @mvriel mvriel committed May 19, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/phpDocumentor/Reflection/File.php
View
2 src/phpDocumentor/Reflection/File.php
@@ -191,7 +191,7 @@ protected function convertToUtf8($filename, $contents)
&& function_exists('mb_detect_encoding')
) {
// OR with mbstring
- $encoding = mb_detect_encoding($contents);
+ $encoding = mb_detect_encoding($contents,'UTF-8,ISO-8859-1');
}
// if the encoding is detected as binary we try again

0 comments on commit 218f006

Please sign in to comment.