From b9dadb77c3c75c6ba6ead293757df440976b3917 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 6 Dec 2009 21:21:35 -0800
Subject: [PATCH] Get rid of unused _method param in the item edit form. Fix
 viewable() to properly OR view restrictions together.

---
 modules/gallery/helpers/item.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index c31264352b..300a6942b6 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -127,7 +127,6 @@ static function get_delete_form($item) {
     $page_type = Input::instance()->get("page_type");
     $form = new Forge(
       "quick/delete/$item->id?page_type=$page_type", "", "post", array("id" => "g-confirm-delete"));
-    $form->hidden("_method")->value("put");
     $group = $form->group("confirm_delete")->label(t("Confirm Deletion"));
     $group->submit("")->value(t("Delete"));
     return $form;
@@ -156,7 +155,7 @@ static function viewable($model) {
     $view_restrictions = array();
     if (!identity::active_user()->admin) {
       foreach (identity::group_ids_for_active_user() as $id) {
-        $view_restrictions[] = "items.view_$id";
+        $view_restrictions["items.view_$id"] = access::ALLOW;
       }
     }
     switch (count($view_restrictions)) {
@@ -168,10 +167,7 @@ static function viewable($model) {
       break;
 
     default:
-      $model
-        ->and_open()
-        ->or_where($view_restrictions, "=", access::ALLOW)
-        ->close();
+      $model->and_open()->or_where($view_restrictions)->close();
       break;
     }