boyska/rss-bridge
1
0
Fork 0
forked from blallo/rss-bridge
Code Releases Activity

Merge pull request #203 from polo2ro/fixencoding

Browse source 
Fix notices and broken encoding in rss output from cache
This commit is contained in:
Mitsu 2016-01-21 21:10:19 +01:00
commit 4ffe329089
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
caches/FileCache.php
View file

@ -8,7 +8,7 @@ class FileCache extends CacheAbstract{
public function loadData(){ public function loadData(){
$this->isPrepareCache(); $this->isPrepareCache();
$datas = json_decode(file_get_contents($this->getCacheFile()),true); $datas = unserialize(file_get_contents($this->getCacheFile()));
$items = array(); $items = array();
foreach($datas as $aData){ foreach($datas as $aData){
$item = new \Item(); $item = new \Item();
@ -25,9 +25,9 @@ class FileCache extends CacheAbstract{
$this->isPrepareCache(); $this->isPrepareCache();
//Re-encode datas to UTF-8 //Re-encode datas to UTF-8
$datas = Cache::utf8_encode_deep($datas); //$datas = Cache::utf8_encode_deep($datas);
$writeStream = file_put_contents($this->getCacheFile(), json_encode($datas)); $writeStream = file_put_contents($this->getCacheFile(), serialize($datas));
if(!$writeStream) { if(!$writeStream) {

2
formats/AtomFormat.php
View file

@ -37,7 +37,7 @@ class AtomFormat extends FormatAbstract{
$entryContent = is_null($data->content) ? '' : '<![CDATA[' . $this->sanitizeHtml(str_replace(']]>','',$data->content)) . ']]>'; $entryContent = is_null($data->content) ? '' : '<![CDATA[' . $this->sanitizeHtml(str_replace(']]>','',$data->content)) . ']]>';
// We generate a list of the enclosure links // We generate a list of the enclosure links
$entryEnclosure = ""; $entryEnclosures = "";
foreach($data->enclosures as $enclosure) { foreach($data->enclosures as $enclosure) {