aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2014-12-26 10:27:30 +0100
committerThomas Citharel <tcit@tcit.fr>2014-12-26 10:27:30 +0100
commit92ae99bd29a19ec71c5cc0bf3494aaf0bdaa1f74 (patch)
tree5d584e5cb2b421c758ac3087af26fa03494c0417 /inc
parentd4d33a4130490a2b1c6986e664ee7adcf0579eab (diff)
parent7a21c308beed66ae6a160d4b4b8ec286e262fca6 (diff)
downloadwallabag-92ae99bd29a19ec71c5cc0bf3494aaf0bdaa1f74.tar.gz
wallabag-92ae99bd29a19ec71c5cc0bf3494aaf0bdaa1f74.tar.zst
wallabag-92ae99bd29a19ec71c5cc0bf3494aaf0bdaa1f74.zip
Merge branch 'dev' of https://github.com/wallabag/wallabag into dev
Diffstat (limited to 'inc')
-rwxr-xr-xinc/poche/Poche.class.php11
1 files changed, 7 insertions, 4 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 27d6f4a6..a29cb327 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -405,9 +405,12 @@ class Poche
405 } 405 }
406 406
407 # flattr checking 407 # flattr checking
408 $flattr = new FlattrItem(); 408 $flattr = NULL;
409 $flattr->checkItem($entry['url'], $entry['id']); 409 if (FLATTR) {
410 410 $flattr = new FlattrItem();
411 $flattr->checkItem($entry['url'], $entry['id']);
412 }
413
411 # tags 414 # tags
412 $tags = $this->store->retrieveTagsByEntry($entry['id']); 415 $tags = $this->store->retrieveTagsByEntry($entry['id']);
413 416
@@ -812,4 +815,4 @@ class Poche
812 } 815 }
813 816
814 817
815} \ No newline at end of file 818}