Merge branch 'Flattr' of git://github.com/tcitworld/poche into tcitworld-Flattr

Conflicts:
	inc/3rdparty/site_config
This commit is contained in:
Nicolas Lœuillet
2013-09-10 19:22:47 +02:00
7 changed files with 71 additions and 4 deletions

View File

@ -247,17 +247,23 @@ class Poche
$tidy = tidy_parse_string($content, array('indent'=>true, 'show-body-only' => true), 'UTF8');
$tidy->cleanRepair();
$content = $tidy->value;
}
$tpl_vars = array(
# flattr checking
$flattr = new FlattrItem();
$flattr->checkItem($entry['url']);
$tpl_vars = array(
'entry' => $entry,
'content' => $content,
);
'flattr' => $flattr
);
}
}
else {
Tools::logm('error in view call : entry is null');
}
break;
default: # home, favorites and archive views
default: # home, favorites and archive views
$entries = $this->store->getEntriesByView($view, $this->user->getId());
$tpl_vars = array(
'entries' => '',