Index: trunk/kernel/include/usersession.php =================================================================== diff -u -N -r1566 -r1854 --- trunk/kernel/include/usersession.php (.../usersession.php) (revision 1566) +++ trunk/kernel/include/usersession.php (.../usersession.php) (revision 1854) @@ -441,7 +441,7 @@ FROM '.$prefix.'PortalUser pu LEFT JOIN '.$prefix.'UserGroup ug USING (PortalUserId) LEFT JOIN '.$prefix.'PortalGroup pg ON ug.GroupId = pg.GroupId - WHERE ('.$key_clause.') AND (pu.Status = 1) AND (pu.Password = %2$s OR MD5(pu.Password) = %2$s OR pu.Password = MD5(%1$s) ) + WHERE ('.$key_clause.') AND (pu.Status = 1) AND (pu.Password = %2$s OR MD5(pu.Password) = %2$s OR pu.Password = MD5(%2$s) ) ORDER BY ug.PrimaryGroup DESC, pg.Personal DESC'; $result = $db->Execute( sprintf($sql, $db->qstr($userLogin), $db->qstr($userPassword) ) );