1
0
mirror of https://github.com/RSS-Bridge/rss-bridge.git synced 2025-07-31 13:50:23 +02:00

[formats] Use custom characterset in all formats

The specified characterset will now apply to all formats
thus allowing other charactersets than 'UTF-8'
This commit is contained in:
logmanoriginal
2016-11-07 20:49:44 +01:00
parent 4f4fb11789
commit 3a2cb9ea1e
5 changed files with 35 additions and 17 deletions

View File

@@ -7,12 +7,17 @@ class JsonFormat extends FormatAbstract {
public function stringify(){
$items = $this->getItems();
return json_encode($items, JSON_PRETTY_PRINT);
$toReturn = json_encode($items, JSON_PRETTY_PRINT);
// Remove invalid non-UTF8 characters
ini_set('mbstring.substitute_character', 'none');
$toReturn = mb_convert_encoding($toReturn, $this->getCharset(), 'UTF-8');
return $toReturn;
}
public function display(){
$this
->setContentType('application/json')
->setContentType('application/json; charset=' . $this->getCharset())
->callContentType();
return parent::display();