mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-12-24 05:48:29 +00:00
Merge branch 'seeddms-6.0.x' into seeddms-6.1.x
This commit is contained in:
commit
d3d86ce229
|
|
@ -67,7 +67,7 @@ class SeedDMS_Core_Role { /* {{{ */
|
|||
$this->_name = $name;
|
||||
$this->_role = $role;
|
||||
$this->_noaccess = $noaccess;
|
||||
$this->_dms = $role;
|
||||
$this->_dms = null;
|
||||
} /* }}} */
|
||||
|
||||
/**
|
||||
|
|
@ -107,7 +107,7 @@ class SeedDMS_Core_Role { /* {{{ */
|
|||
public static function getAllInstances($orderby, $dms) { /* {{{ */
|
||||
$db = $dms->getDB();
|
||||
|
||||
if($orderby == 'ame')
|
||||
if($orderby == 'name')
|
||||
$queryStr = "SELECT * FROM `tblRoles` ORDER BY `name`";
|
||||
else
|
||||
$queryStr = "SELECT * FROM `tblRoles` ORDER BY `id`";
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user