Merge branch 'master' into themes

This commit is contained in:
Christian Weiske 2011-05-23 18:16:50 +02:00
commit 2e58d5cfa9

View file

@ -38,9 +38,12 @@ function getTitle($url) {
preg_match_all('/<title>(.*)<\/title>/si', $html, $matches);
$title = $matches[1][0];
$encoding = 'utf-8';
// Get encoding from charset attribute
preg_match_all('/<meta.*charset=([^;"]*)">/i', $html, $matches);
$encoding = strtoupper($matches[1][0]);
if (isset($matches[1][0])) {
$encoding = strtoupper($matches[1][0]);
}
// Convert to UTF-8 from the original encoding
if (function_exists("mb_convert_encoding")) {