diff options
| author | tcit <tcit@tcit.fr> | 2014-04-23 10:34:22 +0200 |
|---|---|---|
| committer | tcit <tcit@tcit.fr> | 2014-04-23 10:34:22 +0200 |
| commit | c97d23c5334b363250a1d7cfc5cffd0087f35c21 (patch) | |
| tree | 455a4cd0886c0beb51f036482811fb94cbc5fa5e /inc/3rdparty | |
| parent | 4d99bae893eb47505f8ff6976917ef3af363ff5b (diff) | |
| parent | 2a6440c134ee2d90a84b3e3a2e039d8fb4d83d04 (diff) | |
| download | wallabag-c97d23c5334b363250a1d7cfc5cffd0087f35c21.tar.gz wallabag-c97d23c5334b363250a1d7cfc5cffd0087f35c21.tar.zst wallabag-c97d23c5334b363250a1d7cfc5cffd0087f35c21.zip | |
Merge branch 'dev' of https://github.com/wallabag/wallabag into dev
Diffstat (limited to 'inc/3rdparty')
| -rwxr-xr-x | inc/3rdparty/libraries/feedwriter/FeedWriter.php | 17 | ||||
| -rw-r--r-- | inc/3rdparty/site_config/custom/mobile.lemondeinformatique.fr.txt | 6 |
2 files changed, 11 insertions, 12 deletions
diff --git a/inc/3rdparty/libraries/feedwriter/FeedWriter.php b/inc/3rdparty/libraries/feedwriter/FeedWriter.php index df4c8b4b..79639c0c 100755 --- a/inc/3rdparty/libraries/feedwriter/FeedWriter.php +++ b/inc/3rdparty/libraries/feedwriter/FeedWriter.php | |||
| @@ -89,18 +89,11 @@ define('JSONP', 3, true); | |||
| 89 | */ | 89 | */ |
| 90 | public function genarateFeed() | 90 | public function genarateFeed() |
| 91 | { | 91 | { |
| 92 | if ($this->version == RSS2) { | 92 | header('Content-type: text/xml; charset=UTF-8'); |
| 93 | // header('Content-type: text/xml; charset=UTF-8'); | 93 | // this line prevents Chrome 20 from prompting download |
| 94 | // this line prevents Chrome 20 from prompting download | 94 | // used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss |
| 95 | // used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss | 95 | header('X-content-type-options: nosniff'); |
| 96 | // header('X-content-type-options: nosniff'); | 96 | |
| 97 | } elseif ($this->version == JSON) { | ||
| 98 | // header('Content-type: application/json; charset=UTF-8'); | ||
| 99 | $this->json = new stdClass(); | ||
| 100 | } elseif ($this->version == JSONP) { | ||
| 101 | // header('Content-type: application/javascript; charset=UTF-8'); | ||
| 102 | $this->json = new stdClass(); | ||
| 103 | } | ||
| 104 | $this->printHead(); | 97 | $this->printHead(); |
| 105 | $this->printChannels(); | 98 | $this->printChannels(); |
| 106 | $this->printItems(); | 99 | $this->printItems(); |
diff --git a/inc/3rdparty/site_config/custom/mobile.lemondeinformatique.fr.txt b/inc/3rdparty/site_config/custom/mobile.lemondeinformatique.fr.txt new file mode 100644 index 00000000..24aec5c3 --- /dev/null +++ b/inc/3rdparty/site_config/custom/mobile.lemondeinformatique.fr.txt | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | title: //h2 | ||
| 2 | body: div[@id='illustration'] | //p | ||
| 3 | prune: no | ||
| 4 | tidy: no | ||
| 5 | |||
| 6 | test_url: http://mobile.lemondeinformatique.fr/actualites/lire-les-datacenters-d-apple-google-et-facebook-eco-responsables-selon-greenpeace-le-monde-informatique-57122.html | ||