diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2016-04-06 22:00:52 +0200 |
|---|---|---|
| committer | ArthurHoaro <arthur@hoa.ro> | 2016-05-03 19:51:29 +0200 |
| commit | ce7b0b6480aa854ee6893f5c889277b0e3b13efc (patch) | |
| tree | 8d8beb4ea5568d9989a5ebf52e2adc542e17f74e /application/LinkUtils.php | |
| parent | 11609d9fd8ba53f049e6c913d8e3affab6cfc9ce (diff) | |
| download | Shaarli-ce7b0b6480aa854ee6893f5c889277b0e3b13efc.tar.gz Shaarli-ce7b0b6480aa854ee6893f5c889277b0e3b13efc.tar.zst Shaarli-ce7b0b6480aa854ee6893f5c889277b0e3b13efc.zip | |
Fixes #531 - Title retrieving is failing with multiple use case
see https://github.com/shaarli/Shaarli/issues/531 for details
Diffstat (limited to 'application/LinkUtils.php')
| -rw-r--r-- | application/LinkUtils.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/application/LinkUtils.php b/application/LinkUtils.php index d8dc8b5e..2df76ba8 100644 --- a/application/LinkUtils.php +++ b/application/LinkUtils.php | |||
| @@ -9,8 +9,8 @@ | |||
| 9 | */ | 9 | */ |
| 10 | function html_extract_title($html) | 10 | function html_extract_title($html) |
| 11 | { | 11 | { |
| 12 | if (preg_match('!<title>(.*?)</title>!is', $html, $matches)) { | 12 | if (preg_match('!<title.*?>(.*?)</title>!is', $html, $matches)) { |
| 13 | return trim(str_replace("\n", ' ', $matches[1])); | 13 | return trim(str_replace("\n", '', $matches[1])); |
| 14 | } | 14 | } |
| 15 | return false; | 15 | return false; |
| 16 | } | 16 | } |
| @@ -70,7 +70,7 @@ function headers_extract_charset($headers) | |||
| 70 | function html_extract_charset($html) | 70 | function html_extract_charset($html) |
| 71 | { | 71 | { |
| 72 | // Get encoding specified in HTML header. | 72 | // Get encoding specified in HTML header. |
| 73 | preg_match('#<meta .*charset="?([^">/]+)"? */?>#Usi', $html, $enc); | 73 | preg_match('#<meta .*charset=["\']?([^";\'>/]+)["\']? */?>#Usi', $html, $enc); |
| 74 | if (!empty($enc[1])) { | 74 | if (!empty($enc[1])) { |
| 75 | return strtolower($enc[1]); | 75 | return strtolower($enc[1]); |
| 76 | } | 76 | } |