7 files changed, 10 insertions, 10 deletions

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index b3284385..619e6e18 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -265,7 +265,7 @@ class Admin_Users_Controller extends Admin_Controller {
     if ($valid) {
       $new_name = $form->edit_group->inputs["name"]->value;
       $group = group::lookup_by_name($name);
-      if ($group->loaded) {
+      if ($group->loaded()) {
         $form->edit_group->inputs["name"]->add_error("in_use", 1);
         $valid = false;
       }
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index e18e76b6..8309d2cc 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -47,7 +47,7 @@ class Password_Controller extends Controller {
     $valid = $form->validate();
     if ($valid) {
       $user = user::lookup_by_name($form->reset->inputs["name"]->value);
-      if (!$user->loaded || empty($user->email)) {
+      if (!$user->loaded() || empty($user->email)) {
         $form->reset->inputs["name"]->add_error("no_email", 1);
         $valid = false;
       }
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 3aaf1b11..1beaa1c2 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -32,7 +32,7 @@ class group_Core {
    */
   static function create($name) {
     $group = ORM::factory("group")->where("name", $name)->find();
-    if ($group->loaded) {
+    if ($group->loaded()) {
       throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
     }
 
@@ -86,7 +86,7 @@ class group_Core {
   private static function _lookup_by_field($field_name, $value) {
     try {
       $user = model_cache::get("group", $value, $field_name);
-      if ($user->loaded) {
+      if ($user->loaded()) {
         return $user;
       }
     } catch (Exception $e) {
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index f9f16da5..4ed9daee 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -45,7 +45,7 @@ class user_Core {
    */
   static function create($name, $full_name, $password) {
     $user = ORM::factory("user")->where("name", $name)->find();
-    if ($user->loaded) {
+    if ($user->loaded()) {
       throw new Exception("@todo USER_ALREADY_EXISTS $name");
     }
 
@@ -163,7 +163,7 @@ class user_Core {
   private static function _lookup_user_by_field($field_name, $value) {
     try {
       $user = model_cache::get("user", $value, $field_name);
-      if ($user->loaded) {
+      if ($user->loaded()) {
         return $user;
       }
     } catch (Exception $e) {
diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index 4432fc69..81f779cf 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -34,7 +34,7 @@ class Group_Model extends ORM implements Group_Definition {
   }
 
   public function save() {
-    if (!$this->loaded) {
+    if (!$this->loaded()) {
         $created = 1;
     }
     parent::save();
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index bd61def8..0d5a2bcd 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -62,7 +62,7 @@ class User_Model extends ORM implements User_Definition {
   }
 
   public function save() {
-    if (!$this->loaded) {
+    if (!$this->loaded()) {
         $created = 1;
     }
     parent::save();
diff --git a/modules/user/tests/User_Groups_Test.php b/modules/user/tests/User_Groups_Test.php
index 3da8dd34..6aedfde5 100644
--- a/modules/user/tests/User_Groups_Test.php
+++ b/modules/user/tests/User_Groups_Test.php
@@ -22,14 +22,14 @@ class User_Groups_Test extends Unit_Test_Case {
   public function teardown() {
     try {
       $group = ORM::factory("group")->where("name", "user_groups_test")->find();
-      if ($group->loaded) {
+      if ($group->loaded()) {
         $group->delete();
       }
     } catch (Exception $e) { }
 
     try {
       $user = ORM::factory("user")->where("name", "user_groups_test")->find();
-      if ($user->loaded) {
+      if ($user->loaded()) {
         $user->delete();
       }
     } catch (Exception $e) { }