2 files changed, 12 insertions, 12 deletions

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index b3284385..96b86fff 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -22,10 +22,10 @@ class Admin_Users_Controller extends Admin_Controller {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_users.html");
     $view->content->users = ORM::factory("user")
-      ->orderby("name", "ASC")
+      ->order_by("name", "ASC")
       ->find_all();
     $view->content->groups = ORM::factory("group")
-      ->orderby("name", "ASC")
+      ->order_by("name", "ASC")
       ->find_all();
     print $view;
   }
@@ -77,7 +77,7 @@ class Admin_Users_Controller extends Admin_Controller {
 
     $user = user::lookup($id);
     if (empty($user)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $form = $this->_get_user_delete_form_admin($user);
@@ -98,7 +98,7 @@ class Admin_Users_Controller extends Admin_Controller {
   public function delete_user_form($id) {
     $user = user::lookup($id);
     if (empty($user)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
     print $this->_get_user_delete_form_admin($user);
   }
@@ -108,7 +108,7 @@ class Admin_Users_Controller extends Admin_Controller {
 
     $user = user::lookup($id);
     if (empty($user)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $form = $this->_get_user_edit_form_admin($user);
@@ -155,7 +155,7 @@ class Admin_Users_Controller extends Admin_Controller {
   public function edit_user_form($id) {
     $user = user::lookup($id);
     if (empty($user)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $v = new View("user_form.html");
@@ -224,7 +224,7 @@ class Admin_Users_Controller extends Admin_Controller {
 
     $group = group::lookup($id);
     if (empty($group)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $form = $this->_get_group_delete_form_admin($group);
@@ -245,7 +245,7 @@ class Admin_Users_Controller extends Admin_Controller {
   public function delete_group_form($id) {
     $group = group::lookup($id);
     if (empty($group)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     print $this->_get_group_delete_form_admin($group);
@@ -256,7 +256,7 @@ class Admin_Users_Controller extends Admin_Controller {
 
     $group = group::lookup($id);
     if (empty($group)) {
-       kohana::show_404();
+       throw new Kohana_404_Exception();
     }
 
     $form = $this->_get_group_edit_form_admin($group);
@@ -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;
       }
@@ -288,7 +288,7 @@ class Admin_Users_Controller extends Admin_Controller {
   public function edit_group_form($id) {
     $group = group::lookup($id);
     if (empty($group)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     print $this->_get_group_edit_form_admin($group);
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;
       }