diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2014-01-07 13:13:30 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2014-01-07 13:13:30 +0100 |
commit | f41d00ed8a1d25bee6376d7f8a309642636dd4a1 (patch) | |
tree | 0466f2c18368f26323fa9d892353336017d966dc | |
parent | d866e8be91de61a9b7dc40ae68c2390e0e05201d (diff) | |
parent | be4c8197eba9bc6ddfef656433daab12e60d4700 (diff) | |
download | wallabag-f41d00ed8a1d25bee6376d7f8a309642636dd4a1.tar.gz wallabag-f41d00ed8a1d25bee6376d7f8a309642636dd4a1.tar.zst wallabag-f41d00ed8a1d25bee6376d7f8a309642636dd4a1.zip |
Merge branch 'dev' of https://github.com/inthepoche/poche into dev
-rw-r--r-- | inc/3rdparty/FlattrItem.class.php | 4 |
1 files changed, 2 insertions, 2 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; |