diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2013-09-10 19:22:47 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2013-09-10 19:22:47 +0200 |
commit | 12d9cfbcaa236a7d1aa3208a836519af1e1af8ce (patch) | |
tree | 939a744a000668327e29293826564e3a9e3d0da3 /inc/poche/Poche.class.php | |
parent | f3a6080fce5d0473b6452a5984a2092c97df77ec (diff) | |
parent | 964481d023676bee964141a1d14f638995ac8d30 (diff) | |
download | wallabag-12d9cfbcaa236a7d1aa3208a836519af1e1af8ce.tar.gz wallabag-12d9cfbcaa236a7d1aa3208a836519af1e1af8ce.tar.zst wallabag-12d9cfbcaa236a7d1aa3208a836519af1e1af8ce.zip |
Merge branch 'Flattr' of git://github.com/tcitworld/poche into tcitworld-Flattr
Conflicts:
inc/3rdparty/site_config
Diffstat (limited to 'inc/poche/Poche.class.php')
-rw-r--r-- | inc/poche/Poche.class.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 534e660a..9db4a034 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -247,17 +247,23 @@ class Poche | |||
247 | $tidy = tidy_parse_string($content, array('indent'=>true, 'show-body-only' => true), 'UTF8'); | 247 | $tidy = tidy_parse_string($content, array('indent'=>true, 'show-body-only' => true), 'UTF8'); |
248 | $tidy->cleanRepair(); | 248 | $tidy->cleanRepair(); |
249 | $content = $tidy->value; | 249 | $content = $tidy->value; |
250 | } | 250 | |
251 | $tpl_vars = array( | 251 | # flattr checking |
252 | $flattr = new FlattrItem(); | ||
253 | $flattr->checkItem($entry['url']); | ||
254 | |||
255 | $tpl_vars = array( | ||
252 | 'entry' => $entry, | 256 | 'entry' => $entry, |
253 | 'content' => $content, | 257 | 'content' => $content, |
254 | ); | 258 | 'flattr' => $flattr |
259 | ); | ||
260 | } | ||
255 | } | 261 | } |
256 | else { | 262 | else { |
257 | Tools::logm('error in view call : entry is null'); | 263 | Tools::logm('error in view call : entry is null'); |
258 | } | 264 | } |
259 | break; | 265 | break; |
260 | default: # home, favorites and archive views | 266 | default: # home, favorites and archive views |
261 | $entries = $this->store->getEntriesByView($view, $this->user->getId()); | 267 | $entries = $this->store->getEntriesByView($view, $this->user->getId()); |
262 | $tpl_vars = array( | 268 | $tpl_vars = array( |
263 | 'entries' => '', | 269 | 'entries' => '', |