aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2014-12-23 15:34:05 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2014-12-23 15:34:05 +0100
commit7a21c308beed66ae6a160d4b4b8ec286e262fca6 (patch)
treed505f62317ed7937bb1db0b98a95375b4f09d738 /inc
parent9254b6cf460edec3a59e9ccc19873481a1d19c90 (diff)
parent37cad52229ac61b13f69440243df54e0e2a4536f (diff)
downloadwallabag-7a21c308beed66ae6a160d4b4b8ec286e262fca6.tar.gz
wallabag-7a21c308beed66ae6a160d4b4b8ec286e262fca6.tar.zst
wallabag-7a21c308beed66ae6a160d4b4b8ec286e262fca6.zip
Merge pull request #975 from wallabag/fixflattrcalls
don't call flattr if flattr is disabled
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}