From 0736cf203b37534848482e47c3afde9b58d6ce27 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 17 Dec 2009 21:32:53 -0800
Subject: In Kohana 2.4, ORM no longer does the find_all() call for us when we
 retrieve related ORMs.  If we tack a find_all() on the end, it breaks the
 User_Definition interface so create User_Model::groups() and
 Groups_Model::users() as glue.

---
 modules/gallery/helpers/access.php           | 2 +-
 modules/gallery/helpers/identity.php         | 2 +-
 modules/gallery/tests/Access_Helper_Test.php | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 85410085..8ce7e436 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -101,7 +101,7 @@ class access_Core {
 
     $resource = $perm_name == "view" ?
       $item : model_cache::get("access_cache", $item->id, "item_id");
-    foreach ($user->groups->find_all() as $group) {
+    foreach ($user->groups() as $group) {
       if ($resource->__get("{$perm_name}_{$group->id}") === self::ALLOW) {
         return true;
       }
diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php
index 707d1830..eae0ea3e 100644
--- a/modules/gallery/helpers/identity.php
+++ b/modules/gallery/helpers/identity.php
@@ -75,7 +75,7 @@ class identity_Core {
 
       if (!$session->get("group_ids")) {
         $ids = array();
-        foreach ($user->groups->find_all() as $group) {
+        foreach ($user->groups() as $group) {
           $ids[] = $group->id;
         }
         $session->set("group_ids", $ids);
diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index 771c6a85..799d5e44 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -76,7 +76,7 @@ class Access_Helper_Test extends Unit_Test_Case {
     access::deny(identity::registered_users(), "view", $item);
 
     $user = identity::create_user("access_test", "Access Test", "");
-    foreach ($user->groups as $group) {
+    foreach ($user->groups() as $group) {
       $user->remove($group);
     }
     $user->add($access_test);
@@ -93,7 +93,7 @@ class Access_Helper_Test extends Unit_Test_Case {
     access::deny(identity::registered_users(), "view", $item);
 
     $user = identity::create_user("access_test", "Access Test", "");
-    foreach ($user->groups as $group) {
+    foreach ($user->groups() as $group) {
       $user->remove($group);
     }
     $user->save();
@@ -288,7 +288,7 @@ class Access_Helper_Test extends Unit_Test_Case {
   public function i_can_edit_test() {
     // Create a new user that belongs to no groups
     $user = identity::create_user("access_test", "Access Test", "");
-    foreach ($user->groups as $group) {
+    foreach ($user->groups() as $group) {
       $user->remove($group);
     }
     $user->save();
-- 
cgit v1.2.3