diff options
Diffstat (limited to 'classes/handler/public.php')
| -rwxr-xr-x | classes/handler/public.php | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/classes/handler/public.php b/classes/handler/public.php index 86a82cc61..fdf55b1d2 100755 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -45,7 +45,7 @@ class Handler_Public extends Handler { $tmppluginhost = new PluginHost(); $tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL); $tmppluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid); - $tmppluginhost->load_data(); + //$tmppluginhost->load_data(); $handler = $tmppluginhost->get_feed_handler( PluginHost::feed_to_pfeed_id($feed)); @@ -82,13 +82,14 @@ class Handler_Public extends Handler { while ($line = $result->fetch()) { $line["content_preview"] = Sanitizer::sanitize(truncate_string(strip_tags($line["content"]), 100, '...')); + $line["tags"] = Article::get_article_tags($line["id"], $owner_uid); foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) { $line = $p->hook_query_headlines($line); } foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) { - $line = $p->hook_article_export_feed($line, $feed, $is_cat); + $line = $p->hook_article_export_feed($line, $feed, $is_cat, $owner_uid); } $tpl->setVariable('ARTICLE_ID', @@ -121,9 +122,7 @@ class Handler_Public extends Handler { $tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url'] ? $line["site_url"] : get_self_url_prefix()), true); $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true); - $tags = Article::get_article_tags($line["id"], $owner_uid); - - foreach ($tags as $tag) { + foreach ($line["tags"] as $tag) { $tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true); $tpl->addBlock('category'); } @@ -181,6 +180,7 @@ class Handler_Public extends Handler { while ($line = $result->fetch()) { $line["content_preview"] = Sanitizer::sanitize(truncate_string(strip_tags($line["content_preview"]), 100, '...')); + $line["tags"] = Article::get_article_tags($line["id"], $owner_uid); foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) { $line = $p->hook_query_headlines($line, 100); @@ -202,12 +202,10 @@ class Handler_Public extends Handler { if ($line['note']) $article['note'] = $line['note']; if ($article['author']) $article['author'] = $line['author']; - $tags = Article::get_article_tags($line["id"], $owner_uid); - - if (count($tags) > 0) { + if (count($line["tags"]) > 0) { $article['tags'] = array(); - foreach ($tags as $tag) { + foreach ($line["tags"] as $tag) { array_push($article['tags'], $tag); } } @@ -330,7 +328,6 @@ class Handler_Public extends Handler { tag_cache, author, guid, - orig_feed_id, note FROM ttrss_entries,ttrss_user_entries WHERE id = ? AND ref_id = id AND owner_uid = ?"); @@ -1248,7 +1245,7 @@ class Handler_Public extends Handler { $method = clean($_REQUEST["pmethod"]); $host->load($plugin_name, PluginHost::KIND_USER, 0); - $host->load_data(); + //$host->load_data(); $plugin = $host->get_plugin($plugin_name); |