stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-09 21:19:11 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 641... extend viewable functionality to comments. Viewable unit test is not working.

Browse Source
This commit is contained in:
Tim Almdal
2009-08-29 11:43:10 -07:00
parent 27b81257fa
commit 38b2efc44c
5 changed files with 158 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
modules/comment/helpers/comment_rss.php
View File

@@ -33,42 +33,37 @@ class comment_rss_Core {
return;
}
$comments = ORM::factory("comment")
->where("state", "published")
->orderby("created", "DESC");
$all_comments = ORM::factory("comment")
$comment_model = ORM::factory("comment")
->viewable()
->where("state", "published")
->orderby("created", "DESC");
if ($feed_id == "item") {
$comments->where("item_id", $id);
$all_comments->where("item_id", $id);
$comment_model->where("item_id", $id);
}
if (!empty($comments)) {
$feed->view = "comment.mrss";
$comments = $comments->find_all($limit, $offset);
$feed->children = array();
foreach ($comments as $comment) {
$item = $comment->item();
$feed->children[] = new ArrayObject(
array("pub_date" => date("D, d M Y H:i:s T", $comment->created),
"text" => nl2br(p::purify($comment->text)),
"thumb_url" => $item->thumb_url(),
"thumb_height" => $item->thumb_height,
"thumb_width" => $item->thumb_width,
"item_uri" => url::abs_site("{$item->type}s/$item->id"),
"title" => p::purify($item->title),
"author" => p::clean($comment->author_name())),
ArrayObject::ARRAY_AS_PROPS);
}
$feed->max_pages = ceil($all_comments->find_all()->count() / $limit);
$feed->title = htmlspecialchars(t("Recent Comments"));
$feed->uri = url::abs_site("albums/" . (empty($id) ? "1" : $id));
$feed->description = t("Recent Comments");
return $feed;
$comments = $comment_model->find_all($limit, $offset);
$feed->view = "comment.mrss";
$feed->children = array();
foreach ($comments as $comment) {
$item = $comment->item();
$feed->children[] = new ArrayObject(
array("pub_date" => date("D, d M Y H:i:s T", $comment->created),
"text" => nl2br(p::purify($comment->text)),
"thumb_url" => $item->thumb_url(),
"thumb_height" => $item->thumb_height,
"thumb_width" => $item->thumb_width,
"item_uri" => url::abs_site("{$item->type}s/$item->id"),
"title" => p::purify($item->title),
"author" => p::clean($comment->author_name())),
ArrayObject::ARRAY_AS_PROPS);
}
$feed->max_pages = ceil($comment_model->count_all() / $limit);
$feed->title = htmlspecialchars(t("Recent Comments"));
$feed->uri = url::abs_site("albums/" . (empty($id) ? "1" : $id));
$feed->description = t("Recent Comments");
return $feed;
}
}
}