diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-13 11:48:42 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-13 11:48:42 -0700 |
| commit | d9720b77e9c4455df3e3237c285ad5a33afdd591 (patch) | |
| tree | 2d2d7f918b9e7af7d312d7bc08f05fce0e4c528f /modules/gallery/controllers/admin_users.php | |
| parent | 4dd6e4cc4c3353b36a5c69a845ad879ddf085d2f (diff) | |
| parent | 53393a144609c0d8402b14606f52422bf3f28daf (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/admin_users.php
modules/gallery/controllers/password.php
modules/gallery/helpers/group.php
modules/gallery/helpers/user.php
modules/notification/helpers/notification.php
Diffstat (limited to 'modules/gallery/controllers/admin_users.php')
| -rw-r--r-- | modules/gallery/controllers/admin_users.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/controllers/admin_users.php b/modules/gallery/controllers/admin_users.php index 9b7c81f1..34b3a426 100644 --- a/modules/gallery/controllers/admin_users.php +++ b/modules/gallery/controllers/admin_users.php @@ -22,8 +22,8 @@ class Admin_Users_Controller extends Admin_Controller { $view = new Admin_View("admin.html"); $view->content = new View("admin_users.html"); $view->content->writable = user::is_writable(); - $view->content->users = user::users(array("orderby" => array("name" => "ASC"))); - $view->content->groups = group::groups(array("orderby" => array("name" => "ASC"))); + $view->content->users = user::get_user_list(array("orderby" => array("name" => "ASC"))); + $view->content->groups = group::get_group_list(array("orderby" => array("name" => "ASC"))); print $view; } |