From 8a5bbc896b2b281039a5e34a5fc330b826825dd2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 15 Dec 2010 19:57:09 -0800
Subject: Follow on to 1057436b7c483c60b3c128fab993a3b78fac7093 -- cache the
 users and groups as an array so that multiple calls will not call
 ORM_Iterator->current() repeatedly.

---
 modules/user/models/group.php | 6 +++---
 modules/user/models/user.php  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index 66c9aafc..8f8e218d 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -29,12 +29,12 @@ class Group_Model_Core extends ORM implements Group_Definition {
     module::event("group_before_delete", $this);
     parent::delete($id);
     module::event("group_deleted", $old);
-    unset($this->users_cache);
+    $this->users_cache = null;
   }
 
   public function users() {
     if (!$this->users_cache) {
-      $this->users_cache = $this->users->find_all();
+      $this->users_cache = $this->users->find_all()->as_array();
     }
     return $this->users_cache;
   }
@@ -65,7 +65,7 @@ class Group_Model_Core extends ORM implements Group_Definition {
       module::event("group_updated", $original, $this);
     }
 
-    unset($this->users_cache);
+    $this->users_cache = null;
     return $this;
   }
 
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index 47fa7107..585f4b96 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -44,7 +44,7 @@ class User_Model_Core extends ORM implements User_Definition {
     module::event("user_before_delete", $this);
     parent::delete($id);
     module::event("user_deleted", $old);
-    unset($this->groups_cache);
+    $this->groups_cache = null;
   }
 
   /**
@@ -59,7 +59,7 @@ class User_Model_Core extends ORM implements User_Definition {
 
   public function groups() {
     if (!$this->groups_cache) {
-      $this->groups_cache = $this->groups->find_all();
+      $this->groups_cache = $this->groups->find_all()->as_array();
     }
     return $this->groups_cache;
   }
@@ -113,7 +113,7 @@ class User_Model_Core extends ORM implements User_Definition {
       module::event("user_updated", $original, $this);
     }
 
-    unset($this->groups_cache);
+    $this->groups_cache = null;
     return $this;
   }
 
-- 
cgit v1.2.3