diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2014-01-07 04:20:23 -0800 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2014-01-07 04:20:23 -0800 |
commit | b4b22940dfbb8b56422e244272d22b7741e6ce7c (patch) | |
tree | 4ab486d3f7dc77a3fab521faff8e72da8dd3de0b /inc/3rdparty | |
parent | 60fc4f4b1ab37fbfe9021f3fa1395d66a4424ed2 (diff) | |
parent | e1cf0fda27df031e478e55d6df08823d42fe2220 (diff) | |
download | wallabag-b4b22940dfbb8b56422e244272d22b7741e6ce7c.tar.gz wallabag-b4b22940dfbb8b56422e244272d22b7741e6ce7c.tar.zst wallabag-b4b22940dfbb8b56422e244272d22b7741e6ce7c.zip |
Merge pull request #387 from inthepoche/dev1.3.1
poche 1.3.1
Diffstat (limited to 'inc/3rdparty')
-rw-r--r-- | inc/3rdparty/FlattrItem.class.php | 4 | ||||
-rw-r--r-- | inc/3rdparty/site_config/custom/interviewmagazine.com.txt | 4 | ||||
-rw-r--r-- | inc/3rdparty/site_config/custom/inthepoche.com.txt | 7 |
3 files changed, 6 insertions, 9 deletions
diff --git a/inc/3rdparty/FlattrItem.class.php b/inc/3rdparty/FlattrItem.class.php index 0d3e69d0..711b4ee0 100644 --- a/inc/3rdparty/FlattrItem.class.php +++ b/inc/3rdparty/FlattrItem.class.php | |||
@@ -14,12 +14,12 @@ class FlattrItem { | |||
14 | $flattrResponse = file_get_contents(CACHE . "/flattr/".$id.".cache"); | 14 | $flattrResponse = file_get_contents(CACHE . "/flattr/".$id.".cache"); |
15 | if($flattrResponse != FALSE) { | 15 | if($flattrResponse != FALSE) { |
16 | $result = json_decode($flattrResponse); | 16 | $result = json_decode($flattrResponse); |
17 | if (isset($result->message)){ | 17 | if (isset($result->message)){ |
18 | if ($result->message == "flattrable") { | 18 | if ($result->message == "flattrable") { |
19 | $this->status = FLATTRABLE; | 19 | $this->status = FLATTRABLE; |
20 | } | 20 | } |
21 | } | 21 | } |
22 | elseif ($result->link) { | 22 | elseif (is_object($result) && $result->link) { |
23 | $this->status = FLATTRED; | 23 | $this->status = FLATTRED; |
24 | $this->flattrItemURL = $result->link; | 24 | $this->flattrItemURL = $result->link; |
25 | $this->numflattrs = $result->flattrs; | 25 | $this->numflattrs = $result->flattrs; |
diff --git a/inc/3rdparty/site_config/custom/interviewmagazine.com.txt b/inc/3rdparty/site_config/custom/interviewmagazine.com.txt new file mode 100644 index 00000000..a9d4f8ca --- /dev/null +++ b/inc/3rdparty/site_config/custom/interviewmagazine.com.txt | |||
@@ -0,0 +1,4 @@ | |||
1 | title: //title | ||
2 | body: //div[contains(@class, 'block')] | ||
3 | |||
4 | test_url: http://www.interviewmagazine.com/film/spike-jonze \ No newline at end of file | ||
diff --git a/inc/3rdparty/site_config/custom/inthepoche.com.txt b/inc/3rdparty/site_config/custom/inthepoche.com.txt deleted file mode 100644 index ede74b97..00000000 --- a/inc/3rdparty/site_config/custom/inthepoche.com.txt +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | title: //title | ||
2 | body: //div[@class='post-content'] | ||
3 | |||
4 | prune: no | ||
5 | tidy: no | ||
6 | |||
7 | test_url: http://www.inthepoche.com/?post/poche-hosting \ No newline at end of file | ||