diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2020-09-30 11:35:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-30 11:35:57 +0200 |
| commit | c3fca560b624588d37508142ab73573caf467573 (patch) | |
| tree | c02c33b6db135b5e23c36bd4950b656dd3e125c2 /application/front/controller | |
| parent | 769a28833b68f4c629c5578348b31d51016fbf6f (diff) | |
| parent | 1ea09a1b8b8b7f68ec8c7ef069393ee58a0e623a (diff) | |
| download | Shaarli-c3fca560b624588d37508142ab73573caf467573.tar.gz Shaarli-c3fca560b624588d37508142ab73573caf467573.tar.zst Shaarli-c3fca560b624588d37508142ab73573caf467573.zip | |
Merge pull request #1569 from ArthurHoaro/fix/bad-encoding
Fix warning if the encoding retrieved from external headers is invalid
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 | } |