summaryrefslogtreecommitdiff
path: root/classes/handler
diff options
context:
space:
mode:
authorjustauser <[email protected]>2013-06-28 10:46:45 -0400
committerjustauser <[email protected]>2013-06-28 10:46:45 -0400
commit67631438353273ea260be518e627bc25500e01f2 (patch)
tree13b1cc4871094a6d382a0e68ffa338ebed730bdf /classes/handler
parent2e188438456314d4cffab67c6a0baddb0b364b05 (diff)
Changed the implementation of HOOK_QUERY_HEADLINES to deal with issue Fox raised
Diffstat (limited to 'classes/handler')
-rw-r--r--classes/handler/public.php14
1 files changed, 4 insertions, 10 deletions
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 825ea5e2e..08f35e212 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -85,7 +85,7 @@ class Handler_Public extends Handler {
}
$tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
-
+ $line["content_preview"] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
while ($line = $this->dbh->fetch_assoc($result)) {
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
$line = $p->hook_query_headlines($line);
@@ -94,11 +94,7 @@ class Handler_Public extends Handler {
$tpl->setVariable('ARTICLE_ID', htmlspecialchars($line['link']), true);
$tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
$tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
- if(isset($line["modified_preview"]))
- $tpl->setVariable('ARTICLE_EXCERPT', strip_tags($line["content_preview"]), true);
- else
- $tpl->setVariable('ARTICLE_EXCERPT',
- truncate_string(strip_tags($line["content_preview"]), 100, '...'), true);
+ $tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
$content = sanitize($line["content"], false, $owner_uid);
@@ -170,6 +166,7 @@ class Handler_Public extends Handler {
$feed['articles'] = array();
while ($line = $this->dbh->fetch_assoc($result)) {
+ $line["content_preview"]] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
$line = $p->hook_query_headlines($line, 100);
}
@@ -178,10 +175,7 @@ class Handler_Public extends Handler {
$article['id'] = $line['link'];
$article['link'] = $line['link'];
$article['title'] = $line['title'];
- if(isset($line["modified_preview"]))
- $article['excerpt'] = strip_tags($line["content_preview"]);
- else
- $article['excerpt'] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
+ $article['excerpt'] = $line["content_preview"];
$article['content'] = sanitize($line["content"], false, $owner_uid);
$article['updated'] = date('c', strtotime($line["updated"]));