stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-11 04:49:08 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into talmdal_dev

Browse Source 
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
This commit is contained in:
Tim Almdal
2009-10-13 11:48:42 -07:00
parent 4dd6e4cc4c 53393a1446
commit d9720b77e9
13 changed files with 66 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gallery/controllers/admin_users.php
View File

@@ -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;
}