Merge r2926 et r2927 dans branche stable-1.0
This commit is contained in:
parent
49716fe39a
commit
437cf3cfdf
|
@ -281,6 +281,7 @@ img {
|
|||
padding-left: 2px;
|
||||
text-decoration: none;
|
||||
border: 1px solid #F1F8FD;
|
||||
line-height: 0.75em;
|
||||
}
|
||||
|
||||
.menu-box li a img {
|
||||
|
|
|
@ -401,7 +401,7 @@ class m_mysql {
|
|||
function get_userslist() {
|
||||
global $db,$err,$bro,$cuid;
|
||||
$err->log("mysql","get_userslist");
|
||||
$db->query("SELECT name FROM dbusers WHERE uid='$cuid';");
|
||||
$db->query("SELECT name FROM dbusers WHERE uid='$cuid' ORDER BY name;");
|
||||
if (!$db->num_rows()) {
|
||||
$err->raise("mysql",19);
|
||||
return false;
|
||||
|
@ -565,7 +565,6 @@ class m_mysql {
|
|||
return $r;
|
||||
}
|
||||
|
||||
|
||||
/* ------------------------------------------------------------ */
|
||||
/**
|
||||
* Set the access rights of user $user to database $dbn to be rights $rights
|
||||
|
|
Loading…
Reference in New Issue