diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-08-03 10:44:54 +0200 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-08-03 10:44:54 +0200 |
| commit | 6acfab8732e1784b953c8cc2ae7408f84fda7ce8 (patch) | |
| tree | 01e6ac38df46c9ad18f058c8d597617702eb67f3 /inc/confutils.php | |
| parent | 51bd6f039e782dca456022514893aa80bd7c52b9 (diff) | |
| parent | cab505616ec9b8ef3cd671e7337c91d065745932 (diff) | |
| download | rpg-6acfab8732e1784b953c8cc2ae7408f84fda7ce8.tar.gz rpg-6acfab8732e1784b953c8cc2ae7408f84fda7ce8.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into changelogtestsonly
Diffstat (limited to 'inc/confutils.php')
| -rw-r--r-- | inc/confutils.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/inc/confutils.php b/inc/confutils.php index 404cc6050..0ac003b72 100644 --- a/inc/confutils.php +++ b/inc/confutils.php @@ -241,7 +241,7 @@ function getConfigFiles($type) { */ function actionOK($action){ static $disabled = null; - if(is_null($disabled)){ + if(is_null($disabled) || defined('SIMPLE_TEST')){ global $conf; /** @var auth_basic $auth */ global $auth; @@ -261,6 +261,9 @@ function actionOK($action){ if (is_null($auth) || !$auth->canDo('Profile')) { $disabled[] = 'profile'; } + if (is_null($auth) || !$auth->canDo('delUser')) { + $disabled[] = 'profile_delete'; + } if (is_null($auth)) { $disabled[] = 'login'; } |