mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-06-17 15:29:55 -04:00
Rename $comment_model to $comments, this time without stomping on the
pre-existing variable.
This commit is contained in:
@@ -33,19 +33,18 @@ class comment_rss_Core {
|
||||
return;
|
||||
}
|
||||
|
||||
$comment_model = ORM::factory("comment")
|
||||
$comments = ORM::factory("comment")
|
||||
->viewable()
|
||||
->where("state", "published")
|
||||
->orderby("created", "DESC");
|
||||
|
||||
if ($feed_id == "item") {
|
||||
$comment_model->where("item_id", $id);
|
||||
$comments->where("item_id", $id);
|
||||
}
|
||||
|
||||
$comments = $comment_model->find_all($limit, $offset);
|
||||
$feed->view = "comment.mrss";
|
||||
$feed->children = array();
|
||||
foreach ($comments as $comment) {
|
||||
foreach ($comments->find_all($limit, $offset) as $comment) {
|
||||
$item = $comment->item();
|
||||
$feed->children[] = new ArrayObject(
|
||||
array("pub_date" => date("D, d M Y H:i:s T", $comment->created),
|
||||
@@ -59,7 +58,7 @@ class comment_rss_Core {
|
||||
ArrayObject::ARRAY_AS_PROPS);
|
||||
}
|
||||
|
||||
$feed->max_pages = ceil($comment_model->count_all() / $limit);
|
||||
$feed->max_pages = ceil($comments->count_all() / $limit);
|
||||
$feed->title = htmlspecialchars(t("Recent Comments"));
|
||||
$feed->uri = url::abs_site("albums/" . (empty($id) ? "1" : $id));
|
||||
$feed->description = t("Recent Comments");
|
||||
|
||||
Reference in New Issue
Block a user