diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php index c6f89d0c4e..fa30dde848 100644 --- a/main/inc/global.inc.php +++ b/main/inc/global.inc.php @@ -641,6 +641,9 @@ $app->before( case 'admin': $languageFilesToAdd = array('admin'); break; + case 'document': + $languageFilesToAdd = array('document'); + break; case 'dashboard': $languageFilesToAdd = array ('index', 'tracking', 'userInfo', 'admin', 'gradebook'); break; @@ -656,6 +659,9 @@ $app->before( case 'session': $languageFilesToAdd = array('admin', 'registration'); break; + case 'user': + $languageFilesToAdd = array('registration', 'admin', 'userInfo', 'registration'); + break; case 'social': $languageFilesToAdd = array('userInfo'); break; diff --git a/main/user/user.php b/main/user/user.php index a254432573..efdf40bebb 100644 --- a/main/user/user.php +++ b/main/user/user.php @@ -584,7 +584,7 @@ function active_filter($active, $url_params, $row) { } $result = ''; if ($row[count($row)-1]<>$_user['user_id']) { // you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore. - $result = '