diff options
| author | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2013-11-25 02:00:07 -0800 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2013-11-25 02:00:07 -0800 |
| commit | c2b7a11c772a5b503896add11ea18838999f8d58 (patch) | |
| tree | 1976b248eb85e335febc13e0442b8fe766b91687 /inc/3rdparty/simplepie | |
| parent | cd8a3441561fa63b9da1b705c4b28dee787f79b0 (diff) | |
| parent | 7a4482b8a43afca7f5c311ae7e44b3f0c4d239c0 (diff) | |
| download | wallabag-c2b7a11c772a5b503896add11ea18838999f8d58.tar.gz wallabag-c2b7a11c772a5b503896add11ea18838999f8d58.tar.zst wallabag-c2b7a11c772a5b503896add11ea18838999f8d58.zip | |
Merge pull request #326 from inthepoche/dev
1.2.0
Diffstat (limited to 'inc/3rdparty/simplepie')
| -rw-r--r-- | inc/3rdparty/simplepie/SimplePie/Misc.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/3rdparty/simplepie/SimplePie/Misc.php b/inc/3rdparty/simplepie/SimplePie/Misc.php index eabf2738..17dbf963 100644 --- a/inc/3rdparty/simplepie/SimplePie/Misc.php +++ b/inc/3rdparty/simplepie/SimplePie/Misc.php | |||
| @@ -1613,6 +1613,7 @@ class SimplePie_Misc | |||
| 1613 | case 'utf7': | 1613 | case 'utf7': |
| 1614 | return 'UTF-7'; | 1614 | return 'UTF-7'; |
| 1615 | 1615 | ||
| 1616 | case 'utf8lias': | ||
| 1616 | case 'utf8': | 1617 | case 'utf8': |
| 1617 | return 'UTF-8'; | 1618 | return 'UTF-8'; |
| 1618 | 1619 | ||