summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-06-16 14:25:13 -0700
committerBharat Mediratta <bharat@menalto.com>2010-06-16 14:25:13 -0700
commit35bbffcc29fcf592b8dde3670d12f543258f01e0 (patch)
tree90c54472909be485eef1cf829a8e9a6c7e0a5f07
parente3535349abb6e955a75d97f57971f4ea4913da6f (diff)
parent8ee60e6b5d694a8117c94595a0f03090cd41cca8 (diff)
Merge branch 'master' of github.com:gallery/gallery3
-rw-r--r--modules/comment/helpers/comment_rss.php8
-rw-r--r--modules/gallery/helpers/photo.php2
2 files changed, 8 insertions, 2 deletions
diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index eee6f750..479023bd 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -39,7 +39,13 @@ class comment_rss_Core {
->order_by("created", "DESC");
if ($feed_id == "item") {
- $comments->where("item_id", "=", $id);
+ $item = ORM::factory("item", $id);
+ $subquery = db::select("id")
+ ->from("items")
+ ->where("left_ptr", ">=", $item->left_ptr)
+ ->where("right_ptr", "<=", $item->right_ptr);
+ $comments
+ ->where("item_id", "in", $subquery);
}
$feed = new stdClass();
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index f20d37a3..73cd60c0 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -26,7 +26,7 @@
class photo_Core {
static function get_edit_form($photo) {
$form = new Forge("photos/update/$photo->id", "", "post", array("id" => "g-edit-photo-form"));
- $form->hidden("from_id");
+ $form->hidden("from_id")->value($photo->id);
$group = $form->group("edit_item")->label(t("Edit Photo"));
$group->input("title")->label(t("Title"))->value($photo->title)
->error_messages("required", t("You must provide a title"))