moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-23 17:42:15 -05:00
Code Issues Releases Wiki Activity

Merge pull request #711 from mariroz/dev

Browse Source 
fix of uninitialized object warning, issue #710
This commit is contained in:
Nicolas Lœuillet 2014-05-29 16:04:26 +02:00
commit 0c3db64585
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inc/3rdparty/libraries/feedwriter/FeedWriter.php vendored
View File

@ -97,12 +97,15 @@ define('JSONP', 3, true);
header('X-content-type-options: nosniff'); header('X-content-type-options: nosniff');
} elseif ($this->version == JSON) { } elseif ($this->version == JSON) {
header('Content-type: application/json; charset=UTF-8'); header('Content-type: application/json; charset=UTF-8');
$this->json = new stdClass();
} elseif ($this->version == JSONP) { } elseif ($this->version == JSONP) {
header('Content-type: application/javascript; charset=UTF-8'); header('Content-type: application/javascript; charset=UTF-8');
}
}
if ($this->version == JSON || $this->version == JSONP) {
$this->json = new stdClass(); $this->json = new stdClass();
} }
}
$this->printHead(); $this->printHead();
$this->printChannels(); $this->printChannels();
@ -202,7 +205,7 @@ define('JSONP', 3, true);
public function setDescription($description) public function setDescription($description)
{ {
$tag = ($this->version == ATOM)? 'subtitle' : 'description'; $tag = ($this->version == ATOM)? 'subtitle' : 'description';
$this->setChannelElement($tag, $desciption); $this->setChannelElement($tag, $description);
} }
/** /**