5 files changed, 13 insertions, 5 deletions
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();
diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index 3a084684..515788a3 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -33,6 +33,10 @@ class Group_Model extends ORM implements Group_Definition {
     module::event("group_deleted", $old);
   }
 
+  public function users() {
+    return $this->users->find_all();
+  }
+
   public function save() {
     if (!$this->loaded()) {
         $created = 1;
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index e14d9b31..7d5bf413 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -61,6 +61,10 @@ class User_Model extends ORM implements User_Definition {
                    md5($this->email), $size, $default ? "&d=" . urlencode($default) : "");
   }
 
+  public function groups() {
+    return $this->groups->find_all();
+  }
+
   public function save() {
     if (!$this->loaded()) {
         $created = 1;