diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-09-26 13:28:38 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-09-30 11:11:19 +0200 |
commit | 1ea09a1b8b8b7f68ec8c7ef069393ee58a0e623a (patch) | |
tree | aa002767f8d59c11c71fab3d1b27d22978cb85ec /application/front/controller | |
parent | d0ae1ba273b6decea8d35ef79bfabb055b0fb6df (diff) | |
download | Shaarli-1ea09a1b8b8b7f68ec8c7ef069393ee58a0e623a.tar.gz Shaarli-1ea09a1b8b8b7f68ec8c7ef069393ee58a0e623a.tar.zst Shaarli-1ea09a1b8b8b7f68ec8c7ef069393ee58a0e623a.zip |
Fix warning if the encoding retrieved from external headers is invalid
Also fixed the regex to support this failing header: charset="utf-8"\r\n"
Diffstat (limited to 'application/front/controller')
-rw-r--r-- | application/front/controller/admin/ManageShaareController.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/front/controller/admin/ManageShaareController.php b/application/front/controller/admin/ManageShaareController.php index ca2da9b5..ffb0dae4 100644 --- a/application/front/controller/admin/ManageShaareController.php +++ b/application/front/controller/admin/ManageShaareController.php | |||
@@ -69,7 +69,7 @@ class ManageShaareController extends ShaarliAdminController | |||
69 | $retrieveDescription | 69 | $retrieveDescription |
70 | ) | 70 | ) |
71 | ); | 71 | ); |
72 | if (! empty($title) && strtolower($charset) !== 'utf-8') { | 72 | if (! empty($title) && strtolower($charset) !== 'utf-8' && mb_check_encoding($charset)) { |
73 | $title = mb_convert_encoding($title, 'utf-8', $charset); | 73 | $title = mb_convert_encoding($title, 'utf-8', $charset); |
74 | } | 74 | } |
75 | } | 75 | } |