Merged in bugfix/PMC-1006 (pull request #7000)
PMC-1006 Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
@@ -340,7 +340,7 @@ class UsersProperties extends BaseUsersProperties
|
|||||||
global $RBAC;
|
global $RBAC;
|
||||||
$oConf = new Configurations();
|
$oConf = new Configurations();
|
||||||
$oConf->loadConfig($x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '');
|
$oConf->loadConfig($x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '');
|
||||||
if (sizeof($oConf->aConfig) > 0) {
|
if (isset($oConf->aConfig['DEFAULT_MENU'])) {
|
||||||
if ($oConf->aConfig['DEFAULT_MENU'] == 'PM_USERS') {
|
if ($oConf->aConfig['DEFAULT_MENU'] == 'PM_USERS') {
|
||||||
$oConf->aConfig['DEFAULT_MENU'] = 'PM_SETUP';
|
$oConf->aConfig['DEFAULT_MENU'] = 'PM_SETUP';
|
||||||
}
|
}
|
||||||
@@ -474,7 +474,7 @@ class UsersProperties extends BaseUsersProperties
|
|||||||
}
|
}
|
||||||
$url = '';
|
$url = '';
|
||||||
|
|
||||||
if (sizeof($oConf->aConfig) > 0) {
|
if (isset($oConf->aConfig['DEFAULT_MENU'])) {
|
||||||
// this user has a configuration record
|
// this user has a configuration record
|
||||||
// backward compatibility, because now, we don't have user and dashboard menu.
|
// backward compatibility, because now, we don't have user and dashboard menu.
|
||||||
if ($oConf->aConfig['DEFAULT_MENU'] == 'PM_USERS') {
|
if ($oConf->aConfig['DEFAULT_MENU'] == 'PM_USERS') {
|
||||||
|
|||||||
Reference in New Issue
Block a user