mirror of
https://github.com/moparisthebest/wallabag
synced 2024-12-23 15:58:55 -05:00
commit
d151b51c67
23
inc/3rdparty/libraries/feedwriter/FeedWriter.php
vendored
23
inc/3rdparty/libraries/feedwriter/FeedWriter.php
vendored
@ -87,12 +87,25 @@ define('JSONP', 3, true);
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function genarateFeed()
|
||||
public function genarateFeed($withHeaders = true)
|
||||
{
|
||||
header('Content-type: text/xml; charset=UTF-8');
|
||||
// this line prevents Chrome 20 from prompting download
|
||||
// used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss
|
||||
header('X-content-type-options: nosniff');
|
||||
if ($withHeaders) {
|
||||
if ($this->version == RSS2) {
|
||||
header('Content-type: text/xml; charset=UTF-8');
|
||||
// this line prevents Chrome 20 from prompting download
|
||||
// used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss
|
||||
header('X-content-type-options: nosniff');
|
||||
} elseif ($this->version == JSON) {
|
||||
header('Content-type: application/json; charset=UTF-8');
|
||||
} elseif ($this->version == JSONP) {
|
||||
header('Content-type: application/javascript; charset=UTF-8');
|
||||
}
|
||||
}
|
||||
|
||||
if ($this->version == JSON || $this->version == JSONP) {
|
||||
$this->json = new stdClass();
|
||||
}
|
||||
|
||||
|
||||
$this->printHead();
|
||||
$this->printChannels();
|
||||
|
6
inc/3rdparty/makefulltextfeed.php
vendored
6
inc/3rdparty/makefulltextfeed.php
vendored
@ -749,7 +749,7 @@ foreach ($items as $key => $item) {
|
||||
// add effective URL (URL after redirects)
|
||||
if (isset($effective_url)) {
|
||||
//TODO: ensure $effective_url is valid witout - sometimes it causes problems, e.g.
|
||||
//http://www.siasat.pk/forum/showthread.php?108883-Pakistan-Chowk-by-Rana-Mubashir-–-25th-March-2012-Special-Program-from-Liari-(Karachi)
|
||||
//http://www.siasat.pk/forum/showthread.php?108883-Pakistan-Chowk-by-Rana-Mubashir-<EFBFBD>-25th-March-2012-Special-Program-from-Liari-(Karachi)
|
||||
//temporary measure: use utf8_encode()
|
||||
$newitem->addElement('dc:identifier', remove_url_cruft(utf8_encode($effective_url)));
|
||||
} else {
|
||||
@ -831,7 +831,7 @@ if (!$debug_mode) {
|
||||
}
|
||||
if ($add_to_cache) {
|
||||
ob_start();
|
||||
$output->genarateFeed();
|
||||
$output->genarateFeed(false);
|
||||
$output = ob_get_contents();
|
||||
ob_end_clean();
|
||||
if ($html_only && $item_count == 0) {
|
||||
@ -842,7 +842,7 @@ if (!$debug_mode) {
|
||||
}
|
||||
echo $output;
|
||||
} else {
|
||||
$output->genarateFeed();
|
||||
$output->genarateFeed(false);
|
||||
}
|
||||
if ($callback) echo ');';
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user